Merge pull request #3 from MuonColliderSoft/mc

Set master as the officiale branch
MuonColliderSoft · Jun 8, 2021 · 0278600 · 0278600
2 parents a6398eb + c6f6501
commit 0278600
Show file tree

Hide file tree

Showing 4 changed files with 361 additions and 317 deletions.
diff --git a/include/OverlayTiming.h b/include/OverlayTiming.h
@@ -134,6 +134,7 @@ namespace overlay {
     float this_start = -0.25;
     float this_stop = std::numeric_limits<float>::max();
 
+    bool _mergeMCParticles = true;
     std::string _mcParticleCollectionName = "";
     std::string _mcPhysicsParticleCollectionName = "";
     std::string currentDest = "";

diff --git a/include/OverlayTimingGeneric.h b/include/OverlayTimingGeneric.h
@@ -33,7 +33,9 @@ class OverlayTimingGeneric : public overlay::OverlayTiming {
 
   virtual void define_time_windows(const std::string &collectionName);
   std::vector<std::string> _collectionTimesVec{"BeamCalCollection", "10"};
-  std::map< std::string, float > _collectionIntegrationTimes{};
+  std::map< std::string, std::pair<float, float> > _collectionIntegrationTimes{};
+
+  float _integrationTimeMin = -0.25;
 
 };