ECAL : management of Particle Flow RecHits Thresholds and Laser Alpha…

…s parameters
cms-sw · Apr 24, 2019 · 7fd7410 · 7fd7410
1 parent 1fef057
commit 7fd7410
Show file tree

Hide file tree

Showing 8 changed files with 78,164 additions and 117 deletions.
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/EB_thresholds_-1.txt b/CalibCalorimetry/EcalTrivialCondModules/data/EB_thresholds_-1.txt
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/EE_thresholds_-1.txt b/CalibCalorimetry/EcalTrivialCondModules/data/EE_thresholds_-1.txt
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/LaserLossRing.txt b/CalibCalorimetry/EcalTrivialCondModules/data/LaserLossRing.txt
diff --git a/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h b/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h
@@ -89,6 +89,8 @@
 #include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalMappingElectronics.h"
 #include "CondFormats/DataRecord/interface/EcalMappingElectronicsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
+#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
 
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 
@@ -156,6 +158,8 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   virtual std::unique_ptr<EcalClusterEnergyCorrectionParameters> produceEcalClusterEnergyCorrectionParameters( const EcalClusterEnergyCorrectionParametersRcd& );
   virtual std::unique_ptr<EcalClusterEnergyUncertaintyParameters> produceEcalClusterEnergyUncertaintyParameters( const EcalClusterEnergyUncertaintyParametersRcd& );
   virtual std::unique_ptr<EcalClusterEnergyCorrectionObjectSpecificParameters> produceEcalClusterEnergyCorrectionObjectSpecificParameters( const EcalClusterEnergyCorrectionObjectSpecificParametersRcd& );
+  virtual std::unique_ptr<EcalPFRecHitThresholds> produceEcalPFRecHitThresholds( const EcalPFRecHitThresholdsRcd& );
+  virtual std::unique_ptr<EcalPFRecHitThresholds>  getPFRecHitThresholdsFromConfiguration ( const EcalPFRecHitThresholdsRcd& ) ;
 
 
   virtual std::unique_ptr<EcalChannelStatus> produceEcalChannelStatus( const EcalChannelStatusRcd& );
@@ -223,12 +227,24 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   std::vector<double> energyCorrectionParameters_;
   std::vector<double> energyUncertaintyParameters_;
   std::vector<double> energyCorrectionObjectSpecificParameters_;
+  double pfRecHitThresholdsNSigmas_;
+  double pfRecHitThresholdsNSigmasHEta_;
+  double pfRecHitThresholdsEB_;
+  double pfRecHitThresholdsEE_;
 
   double sim_pulse_shape_EB_thresh_;
   double sim_pulse_shape_EE_thresh_;
   double sim_pulse_shape_APD_thresh_;
   float sim_pulse_shape_TI_;
 
+  double laserAlphaMeanEER_higheta_;  
+  double laserAlphaMeanEEC_higheta_;  
+
+  std::string pfRecHitFile_ ;
+  std::string pfRecHitFileEE_ ;
+
+  std::string EELaserAlphaFile2_;
+
 
   // ageing parameters 
   double totLumi_;
@@ -359,6 +375,7 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   bool producedEcalAlignmentEE_;
   bool producedEcalAlignmentES_;
   bool producedEcalSimPulseShape_;
+  bool producedEcalPFRecHitThresholds_;
   bool getEBAlignmentFromFile_;
   bool getEEAlignmentFromFile_;
   bool getESAlignmentFromFile_;

diff --git a/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py b/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py
@@ -39,6 +39,14 @@
     producedEcalADCToGeVConstant = cms.untracked.bool(True),
     adcToGeVEBConstant = cms.untracked.double(0.035),
     adcToGeVEEConstant = cms.untracked.double(0.06),
+### phase I Pulse Shapes
+    sim_pulse_shape_TI = cms.untracked.double( 1.0),
+    sim_pulse_shape_EB_thresh = cms.double(0.00013),
+    sim_pulse_shape_EE_thresh = cms.double(0.00025),
+    sim_pulse_shape_APD_thresh = cms.double(0),
+    EBSimPulseShapeFile = cms.untracked.string("EB_SimPulseShape.txt"),
+    EESimPulseShapeFile = cms.untracked.string("EE_SimPulseShape.txt"),
+    APDSimPulseShapeFile = cms.untracked.string("APD_SimPulseShape.txt"),
     # cluster functions/corrections -- by default no parameters are passed
     producedEcalClusterLocalContCorrParameters = cms.untracked.bool(True),
     localContCorrParameters = cms.untracked.vdouble( 

diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc