A2CBOutput: store primary particle IDs for PID/Veto

Author: werthm

include/A2CBOutput.hh

@@ -49,10 +49,12 @@ protected:
   Int_t ficryst[MAXSIZE_NAI];   //id numbers of Nai hits
   Int_t fpcryst[MAXSIZE_NAI];  //particle index in each NaI crystal
   Int_t fictaps[MAXSIZE_TAPS];   //id numbers of TAPS hits
-  Int_t fpctaps[MAXSIZE_TAPS];   //id numbers of TAPS hits
+  Int_t fpctaps[MAXSIZE_TAPS];   //particle index in each TAPS crystal
   Int_t fivtaps[MAXSIZE_TAPS];   //id numbers of TAPS veto hits
+  Int_t fpvtaps[MAXSIZE_TAPS];   //particle index in each TAPS veto
   Int_t *fidpart;   //g3 id number of initial generated particle
   Int_t fiveto[MAXSIZE_PID];    //id number of the PID hits
+  Int_t fpveto[MAXSIZE_PID];    //particle index in each PID element
   Int_t fnhits;    //Number of NaI hits
   Int_t fnpart;    //number of generated particles (not necessarily same as # tracked)
   Int_t fntaps;    //Number of hits in TAPS

src/A2CBOutput.cc

@@ -100,6 +100,8 @@ void A2CBOutput::SetBranches(){
     G4cout << "Storing IDs of primary particles" << G4endl;
     fTree->Branch("pcryst",fpcryst,"fpcryst[fnhits]/I",basket);
     fTree->Branch("pctaps",fpctaps,"fpctaps[fntaps]/I",basket);
+    fTree->Branch("pveto",fpveto,"fpveto[fvhits]/I",basket);
+    fTree->Branch("pvtaps",fpvtaps,"fpvtaps[fnvtaps]/I",basket);
   }
   fTree->Branch("ivtaps",fivtaps,"fictaps[fnvtaps]/I",basket);
   fTree->Branch("idpart",fidpart,"fidpart[fnpart]/I",basket);
@@ -175,6 +177,7 @@ void A2CBOutput::WriteHit(G4HCofThisEvent* HitsColl){
 	A2Hit* hit=static_cast<A2Hit*>(hc->GetHit(ii));
 	fevtaps[ii]=hit->GetEdep()/GeV;
 	fivtaps[ii]=hit->GetID();
+	fpvtaps[ii]=hit->GetParticle();
       }
     }
     if(hc->GetName()=="A2SDHitsPIDSD"){
@@ -184,6 +187,7 @@ void A2CBOutput::WriteHit(G4HCofThisEvent* HitsColl){
 	feveto[ii]=hit->GetEdep()/GeV;
 	ftveto[ii]=hit->GetTime()/ns;
 	fiveto[ii]=hit->GetID();
+	fpveto[ii]=hit->GetParticle();
       }
     }
     if(hc->GetName().contains("A2MWPCSD")){