Updated profile LUT and call for merged cluster prob.

offline/packages/CaloBase/RawCluster.cc

@@ -28,6 +28,9 @@ RawCluster::get_property_info(const PROPERTY prop_id)
   case prop_chi2:
     return std::make_pair("reduced chi2 for EM shower", RawCluster::type_float);
     break;
+  case prop_merged_cluster_prob:
+    return std::make_pair("cluster template merged pi0 cluster probability for EM shower", RawCluster::type_float);
+    break;
 
   case prop_et_iso_calotower_sub_R01:
     return std::make_pair("subtracted calortower isolation ET R=.1", RawCluster::type_float);

offline/packages/CaloBase/RawCluster.h

@@ -155,6 +155,12 @@ class RawCluster : public PHObject
     PHOOL_VIRTUAL_WARN("get_prob()");
     return std::numeric_limits<float>::signaling_NaN();
   }
+  //! cluster template probability for merged pi0 EM shower
+  virtual float get_merged_cluster_prob() const
+  {
+    PHOOL_VIRTUAL_WARN("get_merged_cluster_prob()");
+    return std::numeric_limits<float>::signaling_NaN();
+  }
   //! isolation ET default
   virtual float get_et_iso() const
   {
@@ -217,6 +223,8 @@ class RawCluster : public PHObject
   virtual void set_chi2(const float) { PHOOL_VIRTUAL_WARNING; }
   //! cluster template probability for EM shower
   virtual void set_prob(const float) { PHOOL_VIRTUAL_WARNING; }
+  //! cluster template merged pi0 cluster probability for EM shower
+  virtual void set_merged_cluster_prob(const float) { PHOOL_VIRTUAL_WARNING; }
   //! isolation ET
   virtual void set_et_iso(const float) { PHOOL_VIRTUAL_WARNING; }
   virtual void set_et_iso(const float /*e*/, const int /*radiusx10*/, bool /*subtracted*/, bool /*clusterTower*/) { PHOOL_VIRTUAL_WARNING; }
@@ -247,6 +255,8 @@ class RawCluster : public PHObject
     prop_prob = 1,
     //! reduced chi2 for EM shower
     prop_chi2 = 2,
+    //! cluster template merged pi0 cluster probability for EM shower
+    prop_merged_cluster_prob = 3,
 
     // ----- analysis specific quantities -----
     //! isolation ET by the calorimeter tower heuristic with subtracted background R=.1

offline/packages/CaloBase/RawClusterv1.h

@@ -66,6 +66,8 @@ class RawClusterv1 : public RawCluster
   float get_chi2() const override { return get_property_float(prop_chi2); }
   //! cluster template probability for EM shower
   float get_prob() const override { return get_property_float(prop_prob); }
+  //! cluster template merged pi0 cluster probability for EM shower
+  float get_merged_cluster_prob() const override { return get_property_float(prop_merged_cluster_prob); }
   //! isolation ET default
   float get_et_iso() const override { return get_property_float(prop_et_iso_calotower_R03); }
   //! isolation ET the radius and hueristic can be specified
@@ -102,6 +104,8 @@ class RawClusterv1 : public RawCluster
   void set_chi2(const float chi2) override { set_property(prop_chi2, chi2); }
   //! cluster template probability for EM shower
   void set_prob(const float prob) override { set_property(prop_prob, prob); }
+  //! cluster template merged pi0 cluster probability for EM shower
+  void set_merged_cluster_prob(const float probmergedcluster) override { set_property(prop_merged_cluster_prob, probmergedcluster); }
   //! isolation ET default
   void set_et_iso(const float e) override { set_property(prop_et_iso_calotower_R03, e); }
   //! isolation ET the radius and hueristic can be specified

offline/packages/CaloBase/TowerInfoContainerSimv2.cc

@@ -42,12 +42,12 @@ TowerInfoContainerSimv2::TowerInfoContainerSimv2(DETECTOR detec)
 
 TowerInfoContainerSimv2::TowerInfoContainerSimv2(const TowerInfoContainerSimv2& source)
   : TowerInfoContainer(source)
+  , _clones(new TClonesArray("TowerInfoSimv2", (int) source.size()))
+  , _detector(source.get_detectorid())
 {
-  _detector = source.get_detectorid();
-  _clones = new TClonesArray("TowerInfoSimv2", source.size());
   _clones->SetOwner();
   _clones->SetName("TowerInfoContainerSimv2");
-  for (unsigned int i = 0; i < source.size(); ++i)
+  for (int i = 0; i < (int) source.size(); ++i)
   {
     // as tower numbers are fixed per event
     // construct towers once per run, and clear the towers for first use
@@ -98,13 +98,13 @@ TowerInfoSimv2* TowerInfoContainerSimv2::get_tower_at_channel(int pos)
 
 TowerInfoSimv2* TowerInfoContainerSimv2::get_tower_at_key(int pos)
 {
-  int index = decode_key(pos);
+  int index = (int) decode_key(pos);
   return (TowerInfoSimv2*) _clones->At(index);
 }
 
 unsigned int TowerInfoContainerSimv2::encode_key(unsigned int towerIndex)
 {
-  int key = 0;
+  unsigned int key = 0;
   if (_detector == DETECTOR::EMCAL)
   {
     key = TowerInfoContainer::encode_emcal(towerIndex);
@@ -130,7 +130,7 @@ unsigned int TowerInfoContainerSimv2::encode_key(unsigned int towerIndex)
 
 unsigned int TowerInfoContainerSimv2::decode_key(unsigned int tower_key)
 {
-  int index = 0;
+  unsigned int index = 0;
 
   if (_detector == DETECTOR::EMCAL)
   {

offline/packages/CaloBase/TowerInfov1.cc

@@ -3,9 +3,9 @@
 #include <limits>
 
 TowerInfov1::TowerInfov1(TowerInfo& tower)
+  : _time(tower.get_time())
+  , _energy(tower.get_energy())
 {
-  _time = (tower.get_time());
-  _energy = (tower.get_energy());
 }
 
 void TowerInfov1::Reset()

offline/packages/CaloReco/BEmcCluster.h

@@ -86,7 +86,7 @@ class EmcCluster : public TObject
   /// Returns number of EmcModules in EmcCluster
   int GetNofHits() { return fHitList.size(); }
   /// Returns EmcCluster fHitList
-  std::vector<EmcModule> GetHitList() { return fHitList; };
+  const std::vector<EmcModule> &GetHitList() { return fHitList; };
   /// Returns the EmcModule with the maximum energy
   EmcModule GetMaxTower();
   /// Returns the EmcModule corresponding to the reconstructed impact tower