Optimize calorimeter energy aggregation in EventDisplay

pnwkw · davidrohr · commit 20f07e60f19a · 2023-02-06T09:39:09.000+01:00
diff --git a/EventVisualisation/Scripts/.o2eve_config b/EventVisualisation/Scripts/.o2eve_config
@@ -40,8 +40,8 @@ phos.barrel.radius:                     550
 phos.tower.color:                       65
 phos.tower.noise                        1
 phos.tower.scale:                       1
-phos.tower.size.eta:                    0.0143
-phos.tower.size.phi:                    0.0143
+phos.tower.size.eta:                    0.0046
+phos.tower.size.phi:                    0.00478
 phos.tower.max.height:                  80
 phos.tower.max.val.abs:                 50
 
diff --git a/EventVisualisation/View/src/EventManager.cxx b/EventVisualisation/View/src/EventManager.cxx
@@ -281,9 +281,7 @@ void EventManager::displayVisualisationEvent(VisualisationEvent& event, const st
 
 void EventManager::displayCalorimeters(VisualisationEvent& event, const std::string& detectorName)
 {
-  int size = event.getCaloCount();
-  if (size > 0) {
-    const std::string detector = detectorName == "EMC" ? "emcal" : "phos";
+  if (event.getCaloCount() > 0) {
     struct CaloInfo {
       std::string name;
       std::string configColor;
@@ -333,9 +331,7 @@ void EventManager::displayCalorimeters(VisualisationEvent& event, const std::str
     };
     std::unordered_map<std::pair<float, float>, float, pair_hash> map; // sum up entries for the same tower
     for (const auto& calo : event.getCalorimetersSpan()) {
-      auto key = std::make_pair(calo.getEta(), calo.getPhi());
-      map.try_emplace(key, 0);
-      map[key] = map[key] + calo.getEnergy();
+      map[std::make_pair(calo.getEta(), calo.getPhi())] += calo.getEnergy();
     }
 
     for (const auto& entry : map) {
