Merge pull request #356 from AndrewEdmonds11/v06_10_00-again

Final commits for v06_10_00

Author: AndrewEdmonds11

fcl/README.md

@@ -28,4 +28,5 @@ where ```tier``` is the data tier of the input dataset, ```type``` is the type o
 | 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 |
 | from_dig-DeMCalib.fcl | digitized primary or mixed datasets | also runs reconstruction, only writes one track per event |
-| from_rec-crv-vst.fcl | CRV VST Data | only contains ```evtinfo``` and ```crv*``` branches |
+| from_rec-crv-kpp.fcl | CRV KPP Data | only contains ```evtinfo``` and ```crv*``` branches |
+| from_rec-crv-kpp_withCrvDigis.fcl | CRV KPP Data | as above but with ```crvdigis``` branch adde |

fcl/from_rec-crv-vst.fcl fcl/from_rec-crv-kpp.fclfcl/from_rec-crv-vst.fcl renamed to fcl/from_rec-crv-kpp.fcl

@@ -1,20 +1,19 @@
 #include "EventNtuple/fcl/from_mcs-mockdata_noMC.fcl"
 
-physics.analyzers.EventNtuple.FillCRVDigis : true
-physics.analyzers.EventNtuple.FillCRVPulses : false # true
+physics.analyzers.EventNtuple.FillCRVDigis : false
+physics.analyzers.EventNtuple.FillCRVPulses : false
 physics.analyzers.EventNtuple.branches : [ ] # no track branches
 physics.analyzers.EventNtuple.FillCaloClusters : false # no calorimeter
 physics.analyzers.EventNtuple.FillCaloHits : false # no calorimeter
+physics.analyzers.EventNtuple.FillCaloClustersMC : false # no calorimeter
+physics.analyzers.EventNtuple.FillCaloSimInfos : false # no calorimeter
 physics.analyzers.EventNtuple.RecoCountTag : ""
 physics.analyzers.EventNtuple.PBTTag : ""
-physics.analyzers.EventNtuple.hasCRV : false # true
+physics.analyzers.EventNtuple.hasCRV : false #false keeps events that have no CRV coincidences
 physics.analyzers.EventNtuple.FillTriggerInfo : false
 
 physics.analyzers.EventNtuple.CrvDigisTag : "CrvDigi"
 physics.analyzers.EventNtuple.CrvCoincidencesTag: "CrvCoincidenceClusterFinder"
 physics.analyzers.EventNtuple.CrvRecoPulsesTag: "CrvRecoPulses"
 
 services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt"
-
-physics.analyzers.EventNtuple.FillCaloClustersMC : false # no calorimeter
-physics.analyzers.EventNtuple.FillCaloSimInfos : false # no calorimeter

fcl/from_rec-crv-kpp_withCrvDigis.fcl

@@ -0,0 +1,3 @@
+#include "EventNtuple/fcl/from_rec-crv-kpp.fcl"
+
+physics.analyzers.EventNtuple.FillCRVDigis : true

src/InfoMCStructHelper.cc

@@ -377,7 +377,7 @@ namespace mu2e {
     }
     ccimcs.push_back(ccimc);
   }
-    float tprimary; // time of the most energetic deposit
+
   void InfoMCStructHelper::fillCaloHitInfoMC(CaloHitMC const& chmc, std::vector<CaloHitInfoMC>& chimcs, int clusterIdx = -1) {
     CaloHitInfoMC chimc;
     auto const& edeps = chmc.energyDeposits();

validation/test_fcls.sh

@@ -16,7 +16,7 @@ primary_dataset=""
 mixed_dataset=""
 extracted_dataset=""
 digi_dataset=""
-crv_vst_dataset="temp_crv_kpp"
+crv_kpp_dataset="temp_crv_kpp"
 
 if [[ "$vMDC" == "MDC2020" ]]; then
     echo "Testing MDC2020 datasets"
@@ -47,7 +47,7 @@ else
     return
 fi
 
-all_datasets=( $mock_dataset $primary_dataset $mixed_dataset $extracted_dataset $digi_dataset $crv_vst_dataset )
+all_datasets=( $mock_dataset $primary_dataset $mixed_dataset $extracted_dataset $digi_dataset $crv_kpp_dataset )
 
 if [ ! -d ../filelists ]; then
      echo "Making directory ../filelists/"
@@ -188,9 +188,18 @@ else
     echo "FAIL" | tee -a ${log_file}
 fi
 
-echo -n "from_rec-crv-vst.fcl... "
-echo "mu2e -c fcl/from_rec-crv-vst.fcl -S ../filelists/${crv_vst_dataset}.list --TFileName nts.ntuple.crv-vst.root -n 100" >> ${log_file} 2>&1
-mu2e -c fcl/from_rec-crv-vst.fcl -S ../filelists/${crv_vst_dataset}.list --TFileName nts.ntuple.crv-vst.root -n 100 >> ${log_file} 2>&1
+echo -n "from_rec-crv-kpp.fcl... "
+echo "mu2e -c fcl/from_rec-crv-kpp.fcl -S ../filelists/${crv_kpp_dataset}.list --TFileName nts.ntuple.crv-kpp.root -n 100" >> ${log_file} 2>&1
+mu2e -c fcl/from_rec-crv-kpp.fcl -S ../filelists/${crv_kpp_dataset}.list --TFileName nts.ntuple.crv-kpp.root -n 100 >> ${log_file} 2>&1
+if [ $? == 0 ]; then
+    echo "OK" | tee -a ${log_file}
+else
+    echo "FAIL" | tee -a ${log_file}
+fi
+
+echo -n "from_rec-crv-kpp_withCrvDigis.fcl... "
+echo "mu2e -c fcl/from_rec-crv-kpp_withCrvDigis.fcl -S ../filelists/${crv_kpp_dataset}.list --TFileName nts.ntuple.crv-kpp_withCrvDigis.root -n 100" >> ${log_file} 2>&1
+mu2e -c fcl/from_rec-crv-kpp_withCrvDigis.fcl -S ../filelists/${crv_kpp_dataset}.list --TFileName nts.ntuple.crv-kpp_withCrvDigis.root -n 100 >> ${log_file} 2>&1
 if [ $? == 0 ]; then
     echo "OK" | tee -a ${log_file}
 else