Porting to CMSSW 12_3_X

CalibTools/interface/EcalCalibMap.h

@@ -22,9 +22,10 @@ class EcalCalibMapBase {
         virtual float& coeff(const DetId& id) =0;
         virtual float& operator[](const DetId& id) =0;
         virtual const float& operator[](const DetId& id) const =0;
-        virtual void loadCalibMapFromFile(const char* cfile) =0;
+        virtual void loadCalibMapFromFile(const char* cfile = "", const bool useGenPhoton2forEoverEtrue = false) =0;
         virtual int getNRegionsEB() =0;
         virtual int getNRegionsEE() =0;
+	virtual ~EcalCalibMapBase(){}
 };
 
 
@@ -70,12 +71,14 @@ class EcalCalibMap : public EcalCalibMapBase {
     int getNRegionsEB() {return nRegionsEB;}
     int getNRegionsEE() {return nRegionsEE;}
 
-    void loadCalibMapFromFile(const char* cfile); 
+    void loadCalibMapFromFile(const char* cfile = "", const bool useGenPhoton2forEoverEtrue = false); 
     // void setCaloGeometry(ECALGeometry *geom);
 
   private:
-    static float mapEB[Type::nRegions];
-    static float mapEE[Type::nRegionsEE];
+    /* static float mapEB[Type::nRegions]; */
+    /* static float mapEE[Type::nRegionsEE]; */
+    float mapEB[Type::nRegions];
+    float mapEE[Type::nRegionsEE];
     static float bad_coeff;
     static const uint32_t nRegionsEB = Type::nRegions;
     static const uint32_t nRegionsEE = Type::nRegionsEE;
@@ -85,32 +88,48 @@ class EcalCalibMap : public EcalCalibMapBase {
 
 
 template<typename Type> 
-void EcalCalibMap<Type>::loadCalibMapFromFile(const char* cfile) 
+void EcalCalibMap<Type>::loadCalibMapFromFile(const char* cfile, const bool useGenPhoton2forEoverEtrue) 
 {
 
-    std::cout << "[EcalCalibMap] :: loadCalibMapFromFile(" << std::string(cfile) << ") called" << std::endl; 
+  // we are also implementing E/Etrue with MC, in which case we have maps for two different photons with E/Etrue instead of the pi0 mass
+  // in this case, useGenPhoton2forEoverEtrue = true implies loading the map for the second gen photon (the first one is stored in the map with the same 
+  // name it would have if we were working with pi0 mass
+
+  std::cout << "FIT_EPSILON: [EcalCalibMap] :: photon " << (useGenPhoton2forEoverEtrue ? 2 : 1) << ", loadCalibMapFromFile(" << std::string(cfile) << ") called" << std::endl; 
     TFile* f = TFile::Open(cfile);
     /// keep trying in case of network I/O problems
     for(int iTrial=0; iTrial<10 && !f; iTrial++)
     {
-        std::cout << "[EcalCalibMap] :: Warning: could not open calibMap.root (trial #" << iTrial << ")" << std::endl;
+        std::cout << "FIT_EPSILON : [EcalCalibMap] :: Warning: could not open calibMap.root (trial #" << iTrial << ")" << std::endl;
         std::cout << "[EcalCalibMap] ::   '-- Could be a network issue. Trying again in 30s..." << std::endl;
         sleep(30);
 
         f = TFile::Open(cfile);
     }
     if(!f) throw cms::Exception("LoadCalibMap") << "[EcalCalibMap] :: cannot open calibMap.root after 10 trials in 300s\n";
-    else std::cout << "[EcalCalibMap] :: " << std::string(cfile) << " successfully opened" << std::endl;
+    else std::cout << "FIT_EPSILON: [EcalCalibMap] :: " << std::string(cfile) << " successfully opened" << std::endl;
 
     // TH2F* hmap = (TH2F*) f->Get("calibMap");
-    TH2F* hmap = (TH2F*) f->Get("calibMap_EB");
-    TH2F* hmap_EEp = (TH2F*) f->Get("calibMap_EEp");
-    TH2F* hmap_EEm = (TH2F*) f->Get("calibMap_EEm");
-    if(!hmap)     throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EB in the file provided\n";
-    if(!hmap_EEp) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEp in the file provided\n";
-    if(!hmap_EEm) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEm in the file provided\n";
+    TH2F* hmap = nullptr;
+    TH2F* hmap_EEp = nullptr;
+    TH2F* hmap_EEm = nullptr;
+    if (useGenPhoton2forEoverEtrue) {
+      hmap = (TH2F*) f->Get("calibMap_EB_g2");
+      hmap_EEp = (TH2F*) f->Get("calibMap_EEp_g2");
+      hmap_EEm = (TH2F*) f->Get("calibMap_EEm_g2");
+      if(!hmap)     throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EB_g2 in the file provided\n";
+      if(!hmap_EEp) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEp_g2 in the file provided\n";
+      if(!hmap_EEm) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEm_g2 in the file provided\n";
+    } else {
+      hmap = (TH2F*) f->Get("calibMap_EB");
+      hmap_EEp = (TH2F*) f->Get("calibMap_EEp");
+      hmap_EEm = (TH2F*) f->Get("calibMap_EEm");
+      if(!hmap)     throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EB in the file provided\n";
+      if(!hmap_EEp) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEp in the file provided\n";
+      if(!hmap_EEm) throw cms::Exception("LoadCalibMap") << "cannot find TH2F::calibMap_EEm in the file provided\n";
+    }
 
-    std::cout << "loading constants from TH2F::calibMap in <" << cfile << "> ..." << std::endl;
+    std::cout << "FIT_EPSILON: loading constants from TH2F::calibMap in <" << cfile << "> ..." << std::endl;
 
     for(int ix=1; ix<= hmap->GetXaxis()->GetNbins(); ++ix) {
        if(ix==86) continue;
@@ -121,7 +140,7 @@ void EcalCalibMap<Type>::loadCalibMapFromFile(const char* cfile)
        }
     }
 
-    std::cout << "loading constants from TH2F::calibMapEE in <" << cfile << "> ..." << std::endl;
+    std::cout << "FIT_EPSILON: loading constants from TH2F::calibMapEE in <" << cfile << "> ..." << std::endl;
 
     for(int jR=0; jR<EEDetId::kSizeForDenseIndexing; jR++)
     {
@@ -145,8 +164,8 @@ void EcalCalibMap<Type>::loadCalibMapFromFile(const char* cfile)
 //  }
 
 
-  template<typename Type> float EcalCalibMap<Type>::mapEB[Type::nRegions];
-  template<typename Type> float EcalCalibMap<Type>::mapEE[Type::nRegionsEE];
-  template<typename Type> float EcalCalibMap<Type>::bad_coeff;
+/* template<typename Type> float EcalCalibMap<Type>::mapEB[Type::nRegions]; */
+/* template<typename Type> float EcalCalibMap<Type>::mapEE[Type::nRegionsEE]; */
+template<typename Type> float EcalCalibMap<Type>::bad_coeff;
 
 #endif

CalibTools/interface/EcalRegionalCalibration.h

@@ -38,6 +38,7 @@ class EcalRegionalCalibrationBase{
         virtual std::string printType() =0;
         virtual std::vector<DetId> allDetIdsInEBRegion(uint32_t iR) =0;
         virtual std::vector<DetId> allDetIdsInEERegion(uint32_t iR) =0;
+	virtual ~EcalRegionalCalibrationBase(){}
 };
 
 template<class Type> class EcalRegionalCalibration : public EcalRegionalCalibrationBase {

CalibTools/interface/EndcapTools.h

@@ -24,6 +24,7 @@ class EndcapTools
         //void setCaloGeometry(string & geometryName);
 
         static const int N_RING_ENDCAP = 78;
+        static const int N_RING_ENDCAP_SIDE = 39;
 
     private:
         static void initializeFromGeometry(); 

CalibTools/src/ECALGeometry.cc

@@ -50,7 +50,7 @@ ECALGeometry::ECALGeometry(TFile* f) {
 
 GlobalPoint ECALGeometry::getPosition(DetId id, float depth) const {
   std::map<DetId,GlobalPoint>::const_iterator it = posMap.find(id);
-  std::map<DetId,GlobalVector>::const_iterator iax = axisMap.find(id);
+  //std::map<DetId,GlobalVector>::const_iterator iax = axisMap.find(id);
   if( it != posMap.end() )
     return it->second + depth*getAxis(id).unit();
   else throw( std::exception() );

CalibTools/src/EndcapTools.cc

@@ -39,7 +39,7 @@ int EndcapTools::getRingIndex(DetId id)
 
     EEDetId eid(id);
     int endcapRingIndex = endcapRingIndex_[eid.ix()-1][eid.iy()-1];
-    if (eid.zside() == 1) endcapRingIndex += N_RING_ENDCAP/2;
+    if (eid.zside() == 1) endcapRingIndex += N_RING_ENDCAP_SIDE;
     return endcapRingIndex;
 }
 
@@ -57,8 +57,8 @@ std::vector<DetId> EndcapTools::getDetIdsInRing(int etaIndex)
     if (!isInitializedFromGeometry_)
 	    initializeFromGeometry();
 
-    int zside= (etaIndex < (N_RING_ENDCAP/2) ) ? -1 : 1;
-    int eeEtaIndex = (etaIndex)%(N_RING_ENDCAP/2); 
+    int zside= (etaIndex < N_RING_ENDCAP_SIDE ) ? -1 : 1;
+    int eeEtaIndex = (etaIndex)%N_RING_ENDCAP_SIDE; 
 
     for (int ix=0;ix<EEDetId::IX_MAX;++ix)
 	    for (int iy=0;iy<EEDetId::IY_MAX;++iy)
@@ -118,20 +118,20 @@ void EndcapTools::initializeFromGeometry()
         //std::cout<<"EE Xtal, |eta| is "<<fabs(cellGeometry->getPosition().eta())<<std::endl;
     }
 
-    float eta_ring[N_RING_ENDCAP/2];
+    float eta_ring[N_RING_ENDCAP_SIDE];
 
     /// span half of the y axis (x value is fixed)
-    for (int ring=0; ring<N_RING_ENDCAP/2; ++ring)
+    for (int ring=0; ring<N_RING_ENDCAP_SIDE; ++ring)
         eta_ring[ring]=m_cellPosEta[ring][50];
 
-    double etaBoundary[N_RING_ENDCAP/2 + 1];
+    double etaBoundary[N_RING_ENDCAP_SIDE + 1];
     etaBoundary[0]=1.47;
     etaBoundary[N_RING_ENDCAP/2]=4.0;
 
-    for (int ring=1; ring<N_RING_ENDCAP/2; ++ring)
+    for (int ring=1; ring<N_RING_ENDCAP_SIDE; ++ring)
         etaBoundary[ring]=(eta_ring[ring]+eta_ring[ring-1])/2.;
 
-    for (int ring=0; ring<N_RING_ENDCAP/2; ring++){
+    for (int ring=0; ring<N_RING_ENDCAP_SIDE; ring++){
     // std::cout<<"***********************EE ring: "<<ring<<" eta "<<(etaBoundary[ring] + etaBoundary[ring+1])/2.<<std::endl;
         for (int ix=0; ix<EEDetId::IX_MAX; ix++)
             for (int iy=0; iy<EEDetId::IY_MAX; iy++)

DumpCaloGeometry/src/DumpCaloGeometry.cc

@@ -19,7 +19,7 @@
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 
 // Geometry
-#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
+#include "Geometry/Records/interface/CaloTopologyRecord.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -114,7 +114,10 @@ void DumpCaloGeometry::analyze(const Event& iEvent,
 
   for (std::vector<DetId>::iterator i=eb_ids.begin(); i!=eb_ids.end(); i++) {
     n++;
-    const CaloCellGeometry* cell=geoEB->getGeometry(*i);
+    // since at least CMSSW_10_1_1, the object geoEB->getGeometry(*i) return an std::shared_ptr<const CaloCellGeometry>
+    // probably the type was changed wrt to release 94X, because now code does not compile, saying cannot convert it to const CaloCellGeometry*
+    // the solution is to use get() method of std::shared_ptr
+    const CaloCellGeometry* cell = geoEB->getGeometry(*i).get();
 
     id = i->rawId();
     xtalPos[0] = dynamic_cast<const TruncatedPyramid*>(cell)->getPosition(0.).x();
@@ -130,7 +133,7 @@ void DumpCaloGeometry::analyze(const Event& iEvent,
 
   for (std::vector<DetId>::iterator i=ee_ids.begin(); i!=ee_ids.end(); i++) {
     n++;
-    const CaloCellGeometry* cell=geoEE->getGeometry(*i);
+    const CaloCellGeometry* cell= geoEE->getGeometry(*i).get();
 
     id = i->rawId();
     xtalPos[0] = dynamic_cast<const TruncatedPyramid*>(cell)->getPosition(0.).x();
@@ -147,7 +150,7 @@ void DumpCaloGeometry::analyze(const Event& iEvent,
 
   for (std::vector<DetId>::iterator i=es_ids.begin(); i!=es_ids.end(); i++) {
     n++;
-    const CaloCellGeometry* cell=geoES->getGeometry(*i);
+    const CaloCellGeometry* cell=geoES->getGeometry(*i).get();
     GlobalPoint position = cell->getPosition();
 
     id = i->rawId();