Skip to content

Commit 691aa7d

Browse files
ErmiasBeyeneErmiasBeyene
authored
Add support for additional dxg3 and dyg3 variables
1 parent 74943a9 commit 691aa7d

File tree

1 file changed

+33
-2
lines changed

1 file changed

+33
-2
lines changed

‎source/digits_hits/src/GateToRoot.cc‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,9 @@ void GateToRoot::CloseTracksRootFile() {
13861386
dxg2_copy = dxg2;
13871387
dyg2_copy = dyg2;
13881388
dzg2_copy = dzg2;
1389+
dxg3_copy = dxg3;
1390+
dyg3_copy = dyg3;
1391+
dzg3_copy = dzg3;
13891392

13901393
m_positronKinEnergy_copy = m_positronKinEnergy;
13911394
m_ionDecayPos_copy = m_ionDecayPos;
@@ -1417,14 +1420,21 @@ void GateToRoot::PrintRecStep() {
14171420
G4cout << "dxg2 = " << dxg2 << Gateendl;
14181421
G4cout << "dyg2 = " << dyg2 << Gateendl;
14191422
G4cout << "dzg2 = " << dzg2 << Gateendl;
1423+
G4cout << "dxg3 = " << dxg3 << Gateendl;
1424+
G4cout << "dyg3 = " << dyg3 << Gateendl;
1425+
G4cout << "dzg3 = " << dzg3 << Gateendl;
14201426
G4cout << "photon1_phantom_Rayleigh = " << theCRData.photon2_phantom_Rayleigh << Gateendl;
14211427
G4cout << "photon2_phantom_Rayleigh = " << theCRData.photon2_phantom_Rayleigh << Gateendl;
1428+
G4cout << "photon3_phantom_Rayleigh = " << theCRData.photon3_phantom_Rayleigh << Gateendl;
14221429
G4cout << "photon1_phantom_compton = " << theCRData.photon1_phantom_compton << Gateendl;
14231430
G4cout << "photon2_phantom_compton = " << theCRData.photon2_phantom_compton << Gateendl;
1431+
G4cout << "photon3_phantom_compton = " << theCRData.photon3_phantom_compton << Gateendl;
14241432
G4cout << "theComptonVolumeName1 = " << theCRData.theComptonVolumeName1 << Gateendl;
14251433
G4cout << "theComptonVolumeName2 = " << theCRData.theComptonVolumeName2 << Gateendl;
1434+
G4cout << "theComptonVolumeName3 = " << theCRData.theComptonVolumeName3 << Gateendl;
14261435
G4cout << "theRayleighVolumeName1 = " << theCRData.theRayleighVolumeName1 << Gateendl;
14271436
G4cout << "theRayleighVolumeName2 = " << theCRData.theRayleighVolumeName2 << Gateendl;
1437+
G4cout << "theRayleighVolumeName3 = " << theCRData.theRayleighVolumeName3 << Gateendl;
14281438
G4cout << "--------------------- COPY------------------------------\n";
14291439
G4cout << "Ion Decay Position = " << m_ionDecayPos_copy << Gateendl;
14301440
G4cout << "positron Generation Position = " << m_positronGenerationPos_copy << Gateendl;
@@ -1436,14 +1446,21 @@ void GateToRoot::PrintRecStep() {
14361446
G4cout << "dxg2 = " << dxg2_copy << Gateendl;
14371447
G4cout << "dyg2 = " << dyg2_copy << Gateendl;
14381448
G4cout << "dzg2 = " << dzg2_copy << Gateendl;
1439-
G4cout << "photon1_phantom_Rayleigh = " << theCRData_copy.photon2_phantom_Rayleigh << Gateendl;
1449+
G4cout << "dxg3 = " << dxg3_copy << Gateendl;
1450+
G4cout << "dyg3 = " << dyg3_copy << Gateendl;
1451+
G4cout << "dzg3 = " << dzg3_copy << Gateendl;
1452+
G4cout << "photon1_phantom_Rayleigh = " << theCRData_copy.photon1_phantom_Rayleigh << Gateendl;
14401453
G4cout << "photon2_phantom_Rayleigh = " << theCRData_copy.photon2_phantom_Rayleigh << Gateendl;
1454+
G4cout << "photon3_phantom_Rayleigh = " << theCRData_copy.photon3_phantom_Rayleigh << Gateendl;
14411455
G4cout << "photon1_phantom_compton = " << theCRData_copy.photon1_phantom_compton << Gateendl;
14421456
G4cout << "photon2_phantom_compton = " << theCRData_copy.photon2_phantom_compton << Gateendl;
1457+
G4cout << "photon3_phantom_compton = " << theCRData_copy.photon3_phantom_compton << Gateendl;
14431458
G4cout << "theComptonVolumeName1 = " << theCRData_copy.theComptonVolumeName1 << Gateendl;
14441459
G4cout << "theComptonVolumeName2 = " << theCRData_copy.theComptonVolumeName2 << Gateendl;
1460+
G4cout << "theComptonVolumeName3 = " << theCRData_copy.theComptonVolumeName3 << Gateendl;
14451461
G4cout << "theRayleighVolumeName1 = " << theCRData_copy.theRayleighVolumeName1 << Gateendl;
14461462
G4cout << "theRayleighVolumeName2 = " << theCRData_copy.theRayleighVolumeName2 << Gateendl;
1463+
G4cout << "theRayleighVolumeName3 = " << theCRData_copy.theRayleighVolumeName3 << Gateendl;
14471464
}
14481465

14491466
/// OPEN ROOT TRACKS DATA FILE IN READ MODE
@@ -1580,14 +1597,21 @@ void GateToRoot::OpenTracksFile() {
15801597
m_RecStepTree->SetBranchAddress(G4String("dxg2").c_str(), &dxg2);
15811598
m_RecStepTree->SetBranchAddress(G4String("dyg2").c_str(), &dyg2);
15821599
m_RecStepTree->SetBranchAddress(G4String("dzg2").c_str(), &dzg2);
1600+
m_RecStepTree->SetBranchAddress(G4String("dxg3").c_str(), &dxg3);
1601+
m_RecStepTree->SetBranchAddress(G4String("dyg3").c_str(), &dyg3);
1602+
m_RecStepTree->SetBranchAddress(G4String("dzg3").c_str(), &dzg3);
15831603
m_RecStepTree->SetBranchAddress(G4String("photon1PhR").c_str(), &theCRData.photon1_phantom_Rayleigh);
15841604
m_RecStepTree->SetBranchAddress(G4String("photon2PhR").c_str(), &theCRData.photon2_phantom_Rayleigh);
1605+
m_RecStepTree->SetBranchAddress(G4String("photon3PhR").c_str(), &theCRData.photon3_phantom_Rayleigh);
15851606
m_RecStepTree->SetBranchAddress(G4String("photon1PhC").c_str(), &theCRData.photon1_phantom_compton);
15861607
m_RecStepTree->SetBranchAddress(G4String("photon2PhC").c_str(), &theCRData.photon2_phantom_compton);
1608+
m_RecStepTree->SetBranchAddress(G4String("photon3PhC").c_str(), &theCRData.photon3_phantom_compton);
15871609
m_RecStepTree->SetBranchAddress(G4String("ComptVol1").c_str(), &theCRData.theComptonVolumeName1);
15881610
m_RecStepTree->SetBranchAddress(G4String("ComptVol2").c_str(), &theCRData.theComptonVolumeName2);
1611+
m_RecStepTree->SetBranchAddress(G4String("ComptVol3").c_str(), &theCRData.theComptonVolumeName3);
15891612
m_RecStepTree->SetBranchAddress(G4String("RaylVol1").c_str(), &theCRData.theRayleighVolumeName1);
15901613
m_RecStepTree->SetBranchAddress(G4String("RaylVol2").c_str(), &theCRData.theRayleighVolumeName2);
1614+
m_RecStepTree->SetBranchAddress(G4String("RaylVol3").c_str(), &theCRData.theRayleighVolumeName3);
15911615
m_RecStepTree->SetBranchAddress(G4String("RunID").c_str(), &m_RSRunID);
15921616

15931617
// rewind counters
@@ -1602,24 +1626,31 @@ void GateToRoot::OpenTracksFile() {
16021626
void GateToRoot::RecordPHData(ComptonRayleighData aCRData) {
16031627
theCRData.photon1_phantom_Rayleigh = aCRData.photon1_phantom_Rayleigh;
16041628
theCRData.photon2_phantom_Rayleigh = aCRData.photon1_phantom_Rayleigh;
1629+
theCRData.photon3_phantom_Rayleigh = aCRData.photon1_phantom_Rayleigh;
16051630
theCRData.photon1_phantom_compton = aCRData.photon1_phantom_compton;
16061631
theCRData.photon2_phantom_compton = aCRData.photon2_phantom_compton;
1632+
theCRData.photon3_phantom_compton = aCRData.photon3_phantom_compton;
16071633
strcpy(theCRData.theComptonVolumeName1, aCRData.theComptonVolumeName1);
16081634
strcpy(theCRData.theComptonVolumeName2, aCRData.theComptonVolumeName2);
1635+
strcpy(theCRData.theComptonVolumeName3, aCRData.theComptonVolumeName3);
16091636
strcpy(theCRData.theRayleighVolumeName1, aCRData.theRayleighVolumeName1);
16101637
strcpy(theCRData.theRayleighVolumeName2, aCRData.theRayleighVolumeName2);
1638+
strcpy(theCRData.theRayleighVolumeName3, aCRData.theRayleighVolumeName3);
16111639
}
16121640

16131641
void GateToRoot::GetPHData(ComptonRayleighData &aCRData) {
16141642
aCRData.photon1_phantom_Rayleigh = theCRData.photon1_phantom_Rayleigh;
16151643
aCRData.photon2_phantom_Rayleigh = theCRData.photon1_phantom_Rayleigh;
1644+
aCRData.photon3_phantom_Rayleigh = theCRData.photon1_phantom_Rayleigh;
16161645
aCRData.photon1_phantom_compton = theCRData.photon1_phantom_compton;
16171646
aCRData.photon2_phantom_compton = theCRData.photon2_phantom_compton;
1647+
aCRData.photon3_phantom_compton = theCRData.photon3_phantom_compton;
16181648
strcpy(aCRData.theComptonVolumeName1, theCRData.theComptonVolumeName1);
16191649
strcpy(aCRData.theComptonVolumeName2, theCRData.theComptonVolumeName2);
1650+
strcpy(aCRData.theComptonVolumeName3, theCRData.theComptonVolumeName3);
16201651
strcpy(aCRData.theRayleighVolumeName1, theCRData.theRayleighVolumeName1);
16211652
strcpy(aCRData.theRayleighVolumeName2, theCRData.theRayleighVolumeName2);
1622-
1653+
strcpy(aCRData.theRayleighVolumeName3, theCRData.theRayleighVolumeName3);
16231654
}
16241655

16251656
void GateToRoot::GetCurrentRecStepData(const G4Event *evt) {

0 commit comments

Comments
 (0)