Merge pull request #316 from AndrewEdmonds11/v06-08-00

Last updates for v06_08_00

Author: AndrewEdmonds11

README.md

@@ -80,10 +80,11 @@ git checkout --no-track -b vXX-YY-ZZ mu2e/main
 ```
 * update version number in histogram ```_hVersion``` in ```src/EventNtupleMaker_module.cc``` and commit
 * make sure EventNtuple runs following these [steps](validation/README.md#Validating-eventntuple-runs)
+  * if any test fails, then you can look in ```test_fcls.log``` to see the error. You can also see the command to rerun and debug locally without having to re-run the whole ```test_fcls.sh``` script
 * create a "before" ntuple with the previous release of EventNtuple. In a fresh login:
 ```
 mu2einit
-muse setup EventNtuple vXX-YY-ZZ
+muse setup EventNtuple vXX_YY_ZZ
 mu2e -c EventNtuple/fcl/from_mcs-mockdata.fcl -S ../EventNtupleDev_NewTag/filelists/mcs.mu2e.ensembleMDS2cMix1BBTriggered.MDC2020ba_best_v1_3.art.list --TFileName nts.ntuple.before.root -n 100
 root -l -b ${MUSE_WORK_DIR}/EventNtuple/validation/create_val_file_rooutil.C\(\"nts.ntuple.before.root\",\"val.ntuple.before.root\"\)
 ```

fcl/from_mcs-DeCalib.fcl

@@ -3,8 +3,6 @@
 #include "EventNtuple/fcl/from_mcs-mockdata.fcl"
 
 process_name: DeCalib
-source : { module_type : RootInput }
-services : @local::Services.Reco
 physics :
 {
   producers : {

fcl/from_mcs-mockdata.fcl

@@ -22,3 +22,5 @@ physics.trigger_paths : [ EventNtuplePath ]
 physics.end_paths : [ EventNtupleEndPath ]
 
 services.TFileService.fileName: "nts.owner.description.version.sequencer.root"
+
+#include "Production/JobConfig/common/epilog.fcl"

fcl/from_rec-crv-vst.fcl

@@ -10,6 +10,7 @@ physics.analyzers.EventNtuple.FillCaloHits : false # no calorimeter
 physics.analyzers.EventNtuple.RecoCountTag : ""
 physics.analyzers.EventNtuple.PBTTag : ""
 physics.analyzers.EventNtuple.hasCRV : true
+physics.analyzers.EventNtuple.FillTriggerInfo : false
 
 physics.analyzers.EventNtuple.CrvDigisTag : "CrvDigi"
 physics.analyzers.EventNtuple.CrvCoincidencesTag: "CrvCoincidenceClusterFinder"

fcl/prolog.fcl

@@ -379,6 +379,7 @@ ENDeCalib : {
     { input: "MergeKKDeCalib"
       branch : "trk"
       trkQualTags : ["TrkQualDe"]
+      trkPIDTags : ["TrkPIDDe"]
       options : { fillMC : true fillHits : true  genealogyDepth : -1 }
     }
   ]

inc/TrigInfo.hh

@@ -9,7 +9,7 @@ namespace mu2e
 {
   struct TrigInfo {
 
-    static const unsigned int ntrig_ = 30;
+    static const unsigned int ntrig_ = 35;
 
     bool _triggerArray[ntrig_];
 

rooutil/examples/PrintEvents.C

@@ -258,7 +258,7 @@ void PrintEvents(std::string filename) {
     }
 
     // trigger branches
-    for (const auto pair : event.trigNameMap) {
+    for (const auto& pair : event.trigNameMap) {
       std::cout << pair.first << ": " << event.triginfo._triggerArray[pair.second] << std::endl;
     }
 

rooutil/inc/RooUtil.hh

@@ -143,7 +143,7 @@ public:
 
     if(event->trkmcsim) { output_ntuple->Branch("trkmcsim", event->trkmcsim); }
 
-    for (const auto pair : event->trigNameMap) {
+    for (const auto& pair : event->trigNameMap) {
       output_ntuple->Branch(pair.first.c_str(), &event->triginfo._triggerArray[pair.second]);
     }
 

src/EventNtupleMaker_module.cc

@@ -447,7 +447,7 @@ namespace mu2e {
     _ntuple=tfs->make<TTree>("ntuple","Mu2e Event Ntuple");
     _hVersion = tfs->make<TH1I>("version", "version number",3,0,3);
     _hVersion->GetXaxis()->SetBinLabel(1, "major"); _hVersion->SetBinContent(1, 6);
-    _hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 7);
+    _hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 8);
     _hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 0);
     // add event info branch
     _ntuple->Branch("evtinfo",&_einfo,_buffsize,_splitlevel);
@@ -932,6 +932,9 @@ namespace mu2e {
     TriggerResultsNavigator tnav(trigResults);
 
     if (firstEvent) {
+      if (tnav.getTrigPaths().size() > TrigInfo::ntrig_) {
+        throw cet::exception("EventNtuple") << "More trigger paths in TriggerResultsNavigator than maximum allowed by TrigInfo::ntrig_. Increase TrigInfo::ntrig_ and rebuild\n";
+      }
       for (unsigned int i = 0; i < tnav.getTrigPaths().size(); ++i) {
           const std::string name = "trig_"+tnav.getTrigPathName(i);
           _ntuple->Branch(name.c_str(), &_triggerResults._triggerArray[i], _buffsize,_splitlevel);