Merge pull request #382 from ehrlich-uva/main

added ROC/FEB/FEB# to crvdigis and sequence index to crvpulses

Author: AndrewEdmonds11

inc/CrvPulseInfoReco.hh

@@ -25,9 +25,10 @@ namespace mu2e
     float  pulseFitChi2 = -1;    //Pulse Fit chi2
     float  time = -1;            //Time
     int    crvHitIndex = -1;     //index of the CRV hit containing this pulse, or -1 if unclustered
+    int    sequenceIndex = -1;   //index of the pulse within a waveform
 
     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);
+    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, int sequenceIndex);
   };
 
   typedef std::vector<CrvPulseInfoReco> CrvPulseInfoRecoCollection;  //this is the reco vector which will be stored in the main TTree

inc/CrvWaveformInfo.hh

@@ -11,12 +11,18 @@ namespace mu2e
     float time = -1;
     int   barId = -1;
     int   SiPMId = -1;
+    int   ROC = -1;
+    int   FEB = -1;
+    int   FEBchannel = -1;
     CrvWaveformInfo(){}
-    CrvWaveformInfo(float adc, float time, int barId, int SiPMId) :
+    CrvWaveformInfo(float adc, float time, int barId, int SiPMId, int ROC, int FEB, int FEBchannel) :
       adc(adc),
       time(time),
       barId(barId),
-      SiPMId(SiPMId)
+      SiPMId(SiPMId),
+      ROC(ROC),
+      FEB(FEB),
+      FEBchannel(FEBchannel)
     {}
   };
 

src/CrvInfoHelper.cc

@@ -306,7 +306,7 @@ namespace mu2e
       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);
+          crvRecoPulse->GetPulseBeta(), crvRecoPulse->GetPulseFitChi2(), crvRecoPulse->GetPulseTime(), crvHitIndex, crvRecoPulse->GetSequenceIndex());
 
       //MCtruth pulses information
       if(!crvDigiMCs.isValid())
@@ -367,7 +367,8 @@ namespace mu2e
     {
       mu2e::CrvDigi const& digi(crvDigis->at(j));
       for(size_t k=0; k<digi.GetADCs().size(); k++)
-        digiInfo.emplace_back(digi.GetADCs()[k], (digi.GetStartTDC()+k)*CRVDigitizationPeriod, digi.GetScintillatorBarIndex().asInt(), digi.GetSiPMNumber());
+        digiInfo.emplace_back(digi.GetADCs()[k], (digi.GetStartTDC()+k)*CRVDigitizationPeriod, digi.GetScintillatorBarIndex().asInt(), digi.GetSiPMNumber(),
+                              digi.GetROC(), digi.GetFEB(), digi.GetFEBchannel());
     }
   } // FillCrvDigiInfoCollections
 

src/CrvPulseInfoReco.cc

@@ -1,7 +1,7 @@
 #include "EventNtuple/inc/CrvPulseInfoReco.hh"
 #include "CLHEP/Vector/ThreeVector.h"
 namespace mu2e {
-  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) :
+  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, int sequenceIndex) :
     pos(ppos),
     barId(barId),
     sectorId(sectorId),
@@ -15,6 +15,7 @@ namespace mu2e {
     pulseBeta(pulseBeta),
     pulseFitChi2(pulseFitChi2),
     time(time),
-    crvHitIndex(crvHitIndex)
+    crvHitIndex(crvHitIndex),
+    sequenceIndex(sequenceIndex)
   {}
 }