Skip to content

Commit a8663a7

Browse files
committed
vector error if only -v without -n solved
1 parent 0be644b commit a8663a7

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

radioactive_decays/src/OMSimDecaysAnalysis.cc

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ void OMSimDecaysAnalysis::appendDecay(G4String pParticleName, G4double pDecayTim
2525
*/
2626
void OMSimDecaysAnalysis::setOutputFileName(G4String pName)
2727
{
28-
mMultiplicityFileName = pName+"_multiplicity.dat";
29-
mHitsFileName = pName+"_hits.dat";
30-
mDecaysFileName = pName+"_decays.dat";
28+
mMultiplicityFileName = pName + "_multiplicity.dat";
29+
mHitsFileName = pName + "_hits.dat";
30+
mDecaysFileName = pName + "_decays.dat";
3131
}
3232

3333
/**
3434
* @brief Calls calculateMultiplicity and writes the results to the output file.
3535
*/
3636
void OMSimDecaysAnalysis::writeMultiplicity()
37-
{
38-
std::vector<int> lMultiplicity = OMSimHitManager::getInstance().calculateMultiplicity(20*ns);
37+
{
38+
std::vector<int> lMultiplicity = OMSimHitManager::getInstance().calculateMultiplicity(20 * ns);
3939
mDatafile.open(mMultiplicityFileName.c_str(), std::ios::out | std::ios::app);
4040
for (const auto &value : lMultiplicity)
4141
{
@@ -45,25 +45,26 @@ void OMSimDecaysAnalysis::writeMultiplicity()
4545
mDatafile.close();
4646
}
4747

48-
4948
/**
5049
* @brief Write isotoped related data to the output file.
5150
*/
5251
void OMSimDecaysAnalysis::writeDecayInformation()
5352
{
5453
mDatafile.open(mDecaysFileName.c_str(), std::ios::out | std::ios::app);
55-
56-
for (int i = 0; i < (int)mDecaysStats.event_id.size(); i++)
54+
if (mDecaysStats.event_id.size() > 0)
5755
{
58-
mDatafile << mDecaysStats.event_id.at(i) << "\t";
59-
mDatafile << std::setprecision(13);
60-
mDatafile << mDecaysStats.decay_time.at(i) << "\t";
61-
mDatafile << std::setprecision(4);
62-
mDatafile << mDecaysStats.isotope_name.at(i) << "\t";
63-
mDatafile << mDecaysStats.decay_position.at(i).x() << "\t";
64-
mDatafile << mDecaysStats.decay_position.at(i).y() << "\t";
65-
mDatafile << mDecaysStats.decay_position.at(i).z() << "\t";
66-
mDatafile << G4endl;
56+
for (int i = 0; i < (int)mDecaysStats.event_id.size(); i++)
57+
{
58+
mDatafile << mDecaysStats.event_id.at(i) << "\t";
59+
mDatafile << std::setprecision(13);
60+
mDatafile << mDecaysStats.decay_time.at(i) << "\t";
61+
mDatafile << std::setprecision(4);
62+
mDatafile << mDecaysStats.isotope_name.at(i) << "\t";
63+
mDatafile << mDecaysStats.decay_position.at(i).x() << "\t";
64+
mDatafile << mDecaysStats.decay_position.at(i).y() << "\t";
65+
mDatafile << mDecaysStats.decay_position.at(i).z() << "\t";
66+
mDatafile << G4endl;
67+
}
6768
}
6869
mDatafile.close();
6970
}
@@ -76,24 +77,25 @@ void OMSimDecaysAnalysis::writeHitInformation()
7677
HitStats lHits = OMSimHitManager::getInstance().getHitsOfModule();
7778

7879
mDatafile.open(mHitsFileName.c_str(), std::ios::out | std::ios::app);
79-
80-
for (int i = 0; i < (int)lHits.event_id.size(); i++)
80+
if (lHits.event_id.size() > 0)
8181
{
82-
mDatafile << lHits.event_id.at(i) << "\t";
83-
mDatafile << std::setprecision(13);
84-
mDatafile << lHits.hit_time.at(i)/s << "\t";
85-
mDatafile << std::setprecision(4);
86-
mDatafile << lHits.PMT_hit.at(i) << "\t";
87-
mDatafile << lHits.photon_energy.at(i) << "\t";
88-
mDatafile << lHits.photon_global_position.at(i).x() << "\t";
89-
mDatafile << lHits.photon_global_position.at(i).y() << "\t";
90-
mDatafile << lHits.photon_global_position.at(i).z() << "\t";
91-
mDatafile << lHits.PMT_response.at(i).PE << "\t";
92-
mDatafile << lHits.PMT_response.at(i).TransitTime << "\t";
93-
mDatafile << lHits.PMT_response.at(i).DetectionProbability << "\t";
94-
mDatafile << G4endl;
82+
for (int i = 0; i < (int)lHits.event_id.size(); i++)
83+
{
84+
mDatafile << lHits.event_id.at(i) << "\t";
85+
mDatafile << std::setprecision(13);
86+
mDatafile << lHits.hit_time.at(i) / s << "\t";
87+
mDatafile << std::setprecision(4);
88+
mDatafile << lHits.PMT_hit.at(i) << "\t";
89+
mDatafile << lHits.photon_energy.at(i) << "\t";
90+
mDatafile << lHits.photon_global_position.at(i).x() << "\t";
91+
mDatafile << lHits.photon_global_position.at(i).y() << "\t";
92+
mDatafile << lHits.photon_global_position.at(i).z() << "\t";
93+
mDatafile << lHits.PMT_response.at(i).PE << "\t";
94+
mDatafile << lHits.PMT_response.at(i).TransitTime << "\t";
95+
mDatafile << lHits.PMT_response.at(i).DetectionProbability << "\t";
96+
mDatafile << G4endl;
97+
}
9598
}
96-
9799
mDatafile.close();
98100
}
99101

0 commit comments

Comments
 (0)