Merge pull request #335 from AndrewEdmonds11/v06-09-00

Final changes for V06_09_00

Author: AndrewEdmonds11

fcl/README.md

@@ -23,6 +23,7 @@ where ```tier``` is the data tier of the input dataset, ```type``` is the type o
 | from_mcs-mockdata_selectorExample.fcl | mock datasets | example on how to use a selector to select certain types of tracks before putting them into the EventNtuple |
 | from_mcs-mixed_trkQualCompare.fcl | reconstructed mixed (i.e. primary+background hits) datasets | shows how to output result of more than one TrkQual |
 | from_mcs-primary_addVDSteps.fcl | reconstructed primary (i.e. no background hits) datasets | shows how to add the branch for virtual detector steps |
+| from_mcs-Run1B.fcl | reconstructed Run-1B (backup plan) datasets | adds the branch for virtual detector steps |
 | from_mcs-DeMCalib.fcl | reconstructed primary or mixed datasets | only writes one track per event |
 | from_mcs-OffSpill.fcl | off spill datasets | only contains ```CentralHelix``` tracks (i.e. field-on cosmics) |
 | from_dig-mockdata.fcl | mock datasets (digis) | runs reconstruction and creates EventNtuple in one job |

fcl/from_mcs-Run1B.fcl

@@ -0,0 +1,4 @@
+#include "EventNtuple/fcl/from_mcs-extracted.fcl"
+
+physics.analyzers.EventNtuple.FillMCInfo : true
+physics.analyzers.EventNtuple.StepPointMCTags : [ "compressRecoMCs:virtualdetector" ]

src/EventNtupleMaker_module.cc

@@ -461,8 +461,8 @@ 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, 8);
-    _hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 2);
+    _hVersion->GetXaxis()->SetBinLabel(2, "minor"); _hVersion->SetBinContent(2, 9);
+    _hVersion->GetXaxis()->SetBinLabel(3, "patch"); _hVersion->SetBinContent(3, 0);
     // add event info branch
     _ntuple->Branch("evtinfo",&_einfo,_buffsize,_splitlevel);
     if (_fillmc) {

validation/create_val_file_rooutil.C

@@ -504,8 +504,6 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
   TH1F* h_calodigis_peakpos_ = new TH1F("h_calodigis_peakpos_", "", 100,0,100);
   TH1F* h_calodigis_caloRecoDigiIdx_ = new TH1F("h_calodigis_caloRecoDigiIdx_", "", 100,0,100);
 
-  TH1F* h_triginfo = new TH1F("h_triginfo", "", mu2e::TrigInfo::ntrig_,0,mu2e::TrigInfo::ntrig_);
-
   TH1F* h_mcsteps_virtualdetector_vid = new TH1F("h_mcsteps_virtualdetector_vid", "", 150,0,150);
   TH1F* h_mcsteps_virtualdetector_sid = new TH1F("h_mcsteps_virtualdetector_sid", "", 100,0,100);
   TH1F* h_mcsteps_virtualdetector_iinter = new TH1F("h_mcsteps_virtualdetector_iinter", "", 100,0,100);
@@ -526,6 +524,8 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
 
   // Grab the first event to name the bins
   const auto& evt = util.GetEvent(0);
+  int max_triginfo_bin = evt.trigger.NameToIndexMap().size();
+  TH1F* h_triginfo = new TH1F("h_triginfo", "", max_triginfo_bin,0,max_triginfo_bin);
   for (const auto pair : evt.trigger.NameToIndexMap()) {
     h_triginfo->GetXaxis()->SetBinLabel(pair.second+1, pair.first.c_str());
   }
@@ -1168,7 +1168,7 @@ void create_val_file_rooutil(std::string filename, std::string outfilename) {
 
     // Creating triginfo histogram
     std::cout << "Creating triginfo histogram" << std::endl;
-    for (int i_trig = 0; i_trig < mu2e::TrigInfo::ntrig_; ++i_trig) {
+    for (int i_trig = 0; i_trig < max_triginfo_bin; ++i_trig) {
       h_triginfo->AddBinContent(i_trig+1, event.triginfo._triggerArray[i_trig]);
     }