Merge pull request #1090 from rlcee/dh_230916b

Dh 230916b
Mu2e · Sep 18, 2023 · 0d8028e · 0d8028e
2 parents e159e94 + b63bab5
commit 0d8028e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/Print/fcl/printMetadata.fcl b/Print/fcl/printMetadata.fcl
@@ -1,5 +1,6 @@
 #
-# print run, event subrun summaries for a file
+# print run, event subrun summaries for a data file
+# for sim files use printMetdataSim.fcl
 #
 
 process_name : rse
@@ -9,13 +10,9 @@ physics :{
       res : {
          module_type : RunSubrunEvent
       }
-      genCountPrint: {
-         module_type: GenEventCountReader
-         makeHistograms: false
-      }
    }
 
-   e1        : [ res , genCountPrint ]
+   e1        : [ res ]
    end_paths : [ e1 ]
 
 }
diff --git a/Print/fcl/printMetadataSim.fcl b/Print/fcl/printMetadataSim.fcl
@@ -0,0 +1,21 @@
+#
+# print run, event subrun summaries for a file
+#
+
+process_name : rse
+
+physics :{
+  analyzers: {
+      res : {
+         module_type : RunSubrunEvent
+      }
+      genCountPrint: {
+         module_type: GenEventCountReader
+         makeHistograms: false
+      }
+   }
+
+   e1        : [ res , genCountPrint ]
+   end_paths : [ e1 ]
+
+}
diff --git a/Print/src/RunSubrunEvent_module.cc b/Print/src/RunSubrunEvent_module.cc
@@ -96,7 +96,7 @@ void mu2e::RunSubrunEvent::beginSubRun(art::SubRun const& subRun) {
   if (!_printSam) return;
 
   // add this subrun to the list, if it is not already there
-  unsigned long long id = subRun.run()*1000000 + subRun.subRun();
+  unsigned long long id = subRun.run()*1000000ull + subRun.subRun();
   subvec::iterator beg = _subruns.begin();
   subvec::iterator end = _subruns.end();
   if (std::find(beg, end, id) == end) _subruns.emplace_back(id);