Add ROC#, FEB#, and FEBchannel# to the crvpulses branch.

Author: RobMina

doc/branches.md

@@ -143,7 +143,7 @@ The branch is empty if there are no CRV hit during the event.
 | crvcoincs |  Vector branch |   information about a cluster of CRV coincidence triplets| [see CrvHitInfoReco.hh](../inc/CrvHitInfoReco.hh)
 | crvcoincsmc |  Vector branch |   information about the MC track which most likely caused the CRV coincidence triplets| [see CrvHitInfoMC.hh](../inc/CrvHitInfoMC.hh)
 | crvcoincsmcplane |  Vector branch |   information about the point where the MC trajectory crosses the xz plane of CRV-T| [see CrvPlaneInfoMC.hh](../inc/CrvPlaneInfoMC.hh)
-| crvpulses |  Vector branch |   information about CRV reco pulses. `crvHitIndex` gives the index in `crvcoincs`, or -1 if the pulse was not clustered into a CRV hit| [see CrvPulseInfoReco.hh](../inc/CrvPulseInfoReco.hh)
+| crvpulses |  Vector branch |   information about CRV reco pulses, including ROC/FEB/FEB channel IDs. `crvHitIndex` gives the index in `crvcoincs`, or -1 if the pulse was not clustered into a CRV hit| [see CrvPulseInfoReco.hh](../inc/CrvPulseInfoReco.hh)
 | crvpulsesmc |  Vector branch |   MC-truth information corresponding entry-by-entry to `crvpulses`| [see CrvHitInfoMC.hh](../inc/CrvHitInfoMC.hh)
 ## Trigger Branches
 

inc/CrvPulseInfoReco.hh

@@ -15,6 +15,9 @@ namespace mu2e
     int    barId = -1;           //CRV counter ID
     int    sectorId = -1;        //CRV sector ID
     int    SiPMId = -1;          //SiPMId number
+    int    ROC = -1;             //ROC number
+    int    FEB = -1;             //FEB number
+    int    FEBchannel = -1;      //FEB channel number
     int    PEs = -1;             //PEs using pulse integral
     int    PEsPulseHeight = -1;  //PEs using pulse height
     float  pulseHeight = -1;     //Pulse height
@@ -24,7 +27,7 @@ namespace mu2e
     int    crvHitIndex = -1;     //index of the CRV hit containing this pulse, or -1 if unclustered
 
     CrvPulseInfoReco(){}
-    CrvPulseInfoReco(CLHEP::Hep3Vector ppos, int barId, int sectorId, int SiPMId, int PEs, int PEsPulseHeight, float pulseHeight, float pulseBeta, float pulseFitChi2, float time, int crvHitIndex);
+    CrvPulseInfoReco(CLHEP::Hep3Vector ppos, int barId, int sectorId, int SiPMId, int ROC, int FEB, int FEBchannel, int PEs, int PEsPulseHeight, float pulseHeight, float pulseBeta, float pulseFitChi2, float time, int crvHitIndex);
   };
 
   typedef std::vector<CrvPulseInfoReco> CrvPulseInfoRecoCollection;  //this is the reco vector which will be stored in the main TTree

rooutil/examples/PrintEvents.C

@@ -212,7 +212,7 @@ void PrintEvents(std::string filename) {
     // crvpulses branch
     if (event.crvpulses != nullptr) {
       for (const auto& crvpulse : *(event.crvpulses)) {
-        std::cout << "crvpulse: " << crvpulse.pos.x() << "," << crvpulse.barId << "," << crvpulse.time << "," << crvpulse.crvHitIndex << std::endl;
+        std::cout << "crvpulse: " << crvpulse.pos.x() << "," << crvpulse.barId << "," << crvpulse.ROC << "," << crvpulse.FEB << "," << crvpulse.FEBchannel << "," << crvpulse.time << "," << crvpulse.crvHitIndex << std::endl;
       }
     }
 

src/CrvInfoHelper.cc

@@ -295,6 +295,7 @@ namespace mu2e
       //Reco pulses information
       CLHEP::Hep3Vector HitPos = CrvHelper::GetCrvCounterPos(CRS, barIndex);
       recoInfo.emplace_back(tdet->toDetector(HitPos), barIndex.asInt(), sectorNumber, crvRecoPulse->GetSiPMNumber(),
+          crvRecoPulse->GetROC(), crvRecoPulse->GetFEB(), crvRecoPulse->GetFEBchannel(),
           crvRecoPulse->GetPEs(), crvRecoPulse->GetPEsPulseHeight(), crvRecoPulse->GetPulseHeight(),
           crvRecoPulse->GetPulseBeta(), crvRecoPulse->GetPulseFitChi2(), crvRecoPulse->GetPulseTime(), crvHitIndex);
 

src/CrvPulseInfoReco.cc

@@ -1,11 +1,14 @@
 #include "EventNtuple/inc/CrvPulseInfoReco.hh"
 #include "CLHEP/Vector/ThreeVector.h"
 namespace mu2e {
-  CrvPulseInfoReco::CrvPulseInfoReco(CLHEP::Hep3Vector ppos, int barId, int sectorId, int SiPMId, int PEs, int PEsPulseHeight, float pulseHeight, float pulseBeta, float pulseFitChi2, float time, int crvHitIndex) :
+  CrvPulseInfoReco::CrvPulseInfoReco(CLHEP::Hep3Vector ppos, int barId, int sectorId, int SiPMId, int ROC, int FEB, int FEBchannel, int PEs, int PEsPulseHeight, float pulseHeight, float pulseBeta, float pulseFitChi2, float time, int crvHitIndex) :
     pos(ppos),
     barId(barId),
     sectorId(sectorId),
     SiPMId(SiPMId),
+    ROC(ROC),
+    FEB(FEB),
+    FEBchannel(FEBchannel),
     PEs(PEs),
     PEsPulseHeight(PEsPulseHeight),
     pulseHeight(pulseHeight),

validation/create_val_file_rooutil.C

@@ -421,6 +421,9 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
   TH1F* h_crvpulses_barId = new TH1F("h_crvpulses_barId", "", 100,0,100);
   TH1F* h_crvpulses_sectorId = new TH1F("h_crvpulses_sectorId", "", 100,0,100);
   TH1F* h_crvpulses_SiPMId = new TH1F("h_crvpulses_SiPMId", "", 100,0,100);
+  TH1F* h_crvpulses_ROC = new TH1F("h_crvpulses_ROC", "", 100,0,100);
+  TH1F* h_crvpulses_FEB = new TH1F("h_crvpulses_FEB", "", 100,0,100);
+  TH1F* h_crvpulses_FEBchannel = new TH1F("h_crvpulses_FEBchannel", "", 100,0,100);
   TH1F* h_crvpulses_PEs = new TH1F("h_crvpulses_PEs", "", 100,0,100);
   TH1F* h_crvpulses_PEsPulseHeight = new TH1F("h_crvpulses_PEsPulseHeight", "", 100,0,100);
   TH1F* h_crvpulses_pulseHeight = new TH1F("h_crvpulses_pulseHeight", "", 100,0,100);
@@ -1089,6 +1092,9 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
         h_crvpulses_barId->Fill(crvpulse.barId);
         h_crvpulses_sectorId->Fill(crvpulse.sectorId);
         h_crvpulses_SiPMId->Fill(crvpulse.SiPMId);
+        h_crvpulses_ROC->Fill(crvpulse.ROC);
+        h_crvpulses_FEB->Fill(crvpulse.FEB);
+        h_crvpulses_FEBchannel->Fill(crvpulse.FEBchannel);
         h_crvpulses_PEs->Fill(crvpulse.PEs);
         h_crvpulses_PEsPulseHeight->Fill(crvpulse.PEsPulseHeight);
         h_crvpulses_pulseHeight->Fill(crvpulse.pulseHeight);