Skip to content

Commit b005438

Browse files
committed
now everything works fine, apparently
1 parent 3312eb5 commit b005438

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

src/SCECalorimeterSD.cc

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ G4bool SCECalorimeterSD::ProcessHits(G4Step* step,
8585
hit->Add(edep, stepLength);
8686
hitTotal->Add(edep, stepLength);
8787
hit->SetPos(pos);
88+
hitTotal->SetPos(pos);
8889

8990
return true;
9091
}

src/SCEEventAction.cc

+7-13
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,21 @@ void SCEEventAction::EndOfEventAction(const G4Event* event)
131131
analysisManager->FillH1(id + 3, gapHit->GetTrackLength());
132132
}
133133

134-
G4cout << "the size of step vector is: " << gapHit->GetPos().size() << G4endl;
135-
136-
// fill ntuple
134+
// fill ntuple and pos histo
137135
analysisManager->FillNtupleDColumn(i, id_tup, absoHit->GetEdep());
138136
analysisManager->FillNtupleDColumn(i, id_tup + 1, gapHit->GetEdep());
139137
analysisManager->FillNtupleDColumn(i, id_tup + 2, absoHit->GetTrackLength());
140138
analysisManager->FillNtupleDColumn(i, id_tup + 3, gapHit->GetTrackLength());
141-
if (gapHit->GetPos().size() != 0) {
142-
for (auto j=gapHit->GetPos().begin(); j!=gapHit->GetPos().end(); j++) {
143-
G4cout << "Inside j for" << G4endl;
144-
analysisManager->FillH1(id + 4, std::sqrt(std::pow(j->x(),2)+std::pow(j->y(),2)));
145-
analysisManager->FillNtupleDColumn(i, id_tup + 4, std::sqrt(std::pow(j->x(),2)+std::pow(j->y(),2)));
139+
140+
if (gapHit->GetPos().empty() == false) {
141+
for (int j=0; j<(int)gapHit->GetPos().size(); ++j) {
142+
analysisManager->FillH1(id + 4, std::sqrt(std::pow(gapHit->GetPos()[j].x(),2)+std::pow(gapHit->GetPos()[j].y(),2)));
143+
analysisManager->FillH2(i, gapHit->GetPos()[j].x(), gapHit->GetPos()[j].y());
144+
analysisManager->FillNtupleDColumn(i, id_tup + 4, std::sqrt(std::pow(gapHit->GetPos()[j].x(),2)+std::pow(gapHit->GetPos()[j].y(),2)));
146145
}
147146
id += 5;
148147
analysisManager->AddNtupleRow(i);
149148
}
150-
151-
else {
152-
id += 4;
153-
analysisManager->AddNtupleRow(i);
154-
}
155149
}
156150
}
157151

src/SCERunAction.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ SCERunAction::SCERunAction(int nenergy, int nlayers, G4String fabsmaterial, doub
4141
analysisManager->CreateH1("Egap" + std::to_string(i),"Edep in gap", 100, 0., nEnergy*GeV);
4242
analysisManager->CreateH1("Labs" + std::to_string(i),"trackL in absorber", 100, 0., nEnergy*m);
4343
analysisManager->CreateH1("Lgap" + std::to_string(i),"trackL in gap", 100, 0., nEnergy*m);
44-
analysisManager->CreateH1("Pgap" + std::to_string(i),"Transverse position in gap", 60, 0., 4*m);
44+
analysisManager->CreateH1("Pgap" + std::to_string(i),"Transverse position in gap", 100, 0., 4*m);
45+
analysisManager->CreateH2("Pgap2D" + std::to_string(i),"X and Y position", 100, -2.5*m, 2.5*m, 100, -2.5*m, 2.5*m);
46+
4547

4648
// Creating ntuple
4749
//
@@ -58,7 +60,8 @@ SCERunAction::SCERunAction(int nenergy, int nlayers, G4String fabsmaterial, doub
5860
analysisManager->CreateH1("Egap_tot","Edep in gap", 100, 0., nEnergy*GeV);
5961
analysisManager->CreateH1("Labs_tot","trackL in absorber", 100, 0., nEnergy*m);
6062
analysisManager->CreateH1("Lgap_tot","trackL in gap", 100, 0., nEnergy*m);
61-
analysisManager->CreateH1("Pgap_tot","Transverse position in gap", 100, 0., 4.*m);
63+
analysisManager->CreateH1("Pgap_tot","Transverse position in gap", 100, 0., 4.*m);
64+
analysisManager->CreateH2("Pgap2D_tot","X and Y position", 100, -2.5*m, 2.5*m, 100, -2.5*m, 2.5*m);
6265

6366
// Creating ntuple for tot
6467
//

0 commit comments

Comments
 (0)