Merge branch 'main' of github.com:Mu2e/EventNtuple into TriggerInfo

Author: michaelmackenzie

fcl/from_mcs-reflection.fcl

@@ -33,30 +33,39 @@ physics :
       @table::TrkQual
       KalSeedPtrCollection : Reflectmu
     }
+    TrkPIDReflecte : {
+      @table::TrkPID
+      KalSeedPtrCollection : Reflecte
+    }
+    TrkPIDReflectmu : {
+      @table::TrkPID
+      KalSeedPtrCollection : Reflectmu
+    }
   }
   filters : {
     Reflecte : {
       @table::TrkReco.SelectReflections
       UpstreamKalSeedCollection : "KKUe"
       DownstreamKalSeedCollection : "KKDe"
-      debugLevel : 0
+      debugLevel : 1
     }
     Reflectmu : {
       @table::TrkReco.SelectReflections
       UpstreamKalSeedCollection : "KKUmu"
       DownstreamKalSeedCollection : "KKDmu"
-      debugLevel : 0
+      debugLevel : 1
     }
   }
-  eTrig : [ Reflecte, TrkQualReflecte ]
-  muTrig : [ Reflectmu, TrkQualReflectmu ]
+  eTrig : [ Reflecte, TrkQualReflecte, TrkPIDReflecte ]
+  muTrig : [ Reflectmu, TrkQualReflectmu, TrkPIDReflectmu ]
   analyzers : {
     ENe : {
       @table::EN
       SelectEvents : [ "eTrig" ]
       branches : [
         { @table::ENBranch
-          trkQualTag : "TrkQualReflecte"
+          trkQualTags : ["TrkQualReflecte"]
+          trkPIDTags : ["TrkPIDReflecte"]
           input: "Reflecte"
         }
       ]
@@ -66,9 +75,11 @@ physics :
       SelectEvents : [ "muTrig" ]
       branches : [
         { @table::ENBranch
-          trkQualTag : "TrkQualReflectmu"
+          trkQualTags : ["TrkQualReflectmu"]
+          trkPIDTags : ["TrkPIDReflectmu"]
           input: "Reflectmu"
         }
+
       ]
     }
     printModule : {

fcl/prolog.fcl

@@ -274,6 +274,7 @@ EventNtupleMaker : {
   RecoCountTag : "SelectReco"
   PBITag : "PBISim"
   PBTTag : "EWMProducer"
+  EWMTag : "EWMProducer"
   PBTMCTag : "EWMProducer"
   CrvCoincidencesTag : "SelectReco:CrvCoincidenceClusterFinder"
   CrvCoincidenceMCsTag : "compressRecoMCs:CrvCoincidenceClusterMatchMC"

inc/CrvInfoHelper.hh

@@ -21,6 +21,7 @@
 #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh"
 #include "Offline/GeometryService/inc/GeomHandle.hh"
 #include "art/Framework/Principal/Handle.h"
+#include "Offline/DataProducts/inc/EventWindowMarker.hh"
 
 namespace mu2e
 {
@@ -44,6 +45,7 @@ namespace mu2e
       void FillCrvPulseInfoCollections(
           art::Handle<CrvRecoPulseCollection> const& crvRecoPulses,
           art::Handle<CrvDigiMCCollection> const& crvDigiMCs,
+          art::Handle<EventWindowMarker> const& ewmh,
           CrvPulseInfoRecoCollection &recoInfo, CrvHitInfoMCCollection &MCInfo);
 
       void FillCrvDigiInfoCollections(

src/CrvInfoHelper.cc

@@ -211,6 +211,7 @@ namespace mu2e
   void CrvInfoHelper::FillCrvPulseInfoCollections (
       art::Handle<CrvRecoPulseCollection> const& crvRecoPulses,
       art::Handle<CrvDigiMCCollection> const& crvDigiMCs,
+      art::Handle<EventWindowMarker> const& ewmh,
       CrvPulseInfoRecoCollection &recoInfo, CrvHitInfoMCCollection &MCInfo){
     GeomHandle<DetectorSystem> tdet;
 
@@ -248,7 +249,7 @@ namespace mu2e
       art::Ptr<SimParticle> mostLikelySimParticle;
       //for this reco pulse
       CrvMCHelper::GetInfoFromCrvRecoPulse(crvRecoPulse, crvDigiMCs, visibleEnergyDeposited,earliestHitTime, earliestHitPos, avgHitTime, avgHitPos,
-          mostLikelySimParticle);
+                                           mostLikelySimParticle, ewmh);
 
       bool hasMCInfo = (mostLikelySimParticle.isNonnull()?true:false); //MC
       if(hasMCInfo)

src/EventNtupleMaker_module.cc

@@ -140,6 +140,7 @@ namespace mu2e {
         fhicl::Atom<art::InputTag> rctag{Name("RecoCountTag"), Comment("RecoCount"), art::InputTag()};
         fhicl::Atom<art::InputTag> PBITag{Name("PBITag"), Comment("Tag for ProtonBunchIntensity object") ,art::InputTag()};
         fhicl::Atom<art::InputTag> PBTTag{Name("PBTTag"), Comment("Tag for ProtonBunchTime object") ,art::InputTag()};
+        fhicl::Atom<art::InputTag> EWMTag{Name("EWMTag"), Comment("Tag for EventWindowMarker object") ,art::InputTag()};
         fhicl::Atom<bool> filltrig{Name("FillTriggerInfo"),false};
         fhicl::Atom<std::string> trigProcessName{Name("TriggerProcessName"), Comment("Process name for Trigger")};
         fhicl::Atom<std::string> trigpathsuffix{Name("TriggerPathSuffix"), "_trigger"}; // all trigger paths have this in the name
@@ -213,7 +214,8 @@ namespace mu2e {
       // general event info branch
       EventInfo _einfo;
       EventInfoMC _einfomc;
-      art::InputTag _recoCountTag, _PBITag, _PBTTag, _PBTMCTag;
+      art::InputTag _recoCountTag, _PBITag, _PBTTag, _EWMTag, _PBTMCTag;
+      art::Handle<mu2e::EventWindowMarker> _ewmh;
       // track control
       bool _hastrks;
       bool _hascrv;
@@ -347,6 +349,7 @@ namespace mu2e {
     _recoCountTag(conf().rctag()),
     _PBITag(conf().PBITag()),
     _PBTTag(conf().PBTTag()),
+    _EWMTag(conf().EWMTag()),
     _PBTMCTag(conf().PBTMCTag()),
     _hastrks(conf().hastrks()),
     _hascrv(conf().hascrv()),
@@ -863,8 +866,8 @@ namespace mu2e {
                                            _crvRecoPulses, _crvSteps, _mcTrajectories,_crvcoincs, _crvcoincsmc,
                                            _crvsummary, _crvsummarymc, _crvcoincsmcplane, _crvPlaneY, _pph);
       if(_fillcrvpulses){
-        _crvHelper.FillCrvPulseInfoCollections(_crvRecoPulses, _crvDigiMCs,
-                                              _crvpulses, _crvpulsesmc);
+        _crvHelper.FillCrvPulseInfoCollections(_crvRecoPulses, _crvDigiMCs, _ewmh,
+                                               _crvpulses, _crvpulsesmc);
       }
       if(_fillcrvdigis){
         _crvHelper.FillCrvDigiInfoCollections(_crvRecoPulses, _crvDigis,
@@ -906,6 +909,10 @@ namespace mu2e {
       _einfo.pbterr = PBT.pbterr_;
     }
 
+    if (_EWMTag != "") {
+      event.getByLabel(_EWMTag, _ewmh);
+    }
+
     if (_fillmc) {
       auto PBTMChandle = event.getValidHandle<mu2e::ProtonBunchTimeMC>(_PBTMCTag);
       auto PBTMC = *PBTMChandle;