Merge pull request #5 from Sam-Harper/GSIssueRecHitsToGlobal

changing the GS rec-hits reco from weights to global

RecoEcal/EgammaClusterProducers/python/ecalMultiAndGSWeightRecHitEB_cfi.py → RecoEcal/EgammaClusterProducers/python/ecalMultiAndGSGlobalRecHitEB_cfi.py

@@ -1,11 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
-ecalMultiAndGSWeightRecHitEB = cms.EDProducer("CombinedRecHitCollectionProducer",
+ecalMultiAndGSGlobalRecHitEB = cms.EDProducer("CombinedRecHitCollectionProducer",
                                               primaryRecHits=cms.InputTag("reducedEcalRecHitsEB",processName=cms.InputTag.skipCurrentProcess()),
-                                              secondaryRecHits=cms.InputTag("ecalWeightRecHitSelectedDigis","EcalRecHitsEB"),
+                                              secondaryRecHits=cms.InputTag("ecalGlobalRecHitSelectedDigis","EcalRecHitsEB"),
                                               outputCollectionName=cms.string(""),
                                               outputReplacedHitsCollName =cms.string("gsMultiFit"),
-                                              outputReplacingHitsCollName =cms.string("gsWeight"),
-
+                                              outputReplacingHitsCollName =cms.string("gsGlobal"),                                              
                                               flagsToReplaceHit=cms.vstring("kHasSwitchToGain6","kHasSwitchToGain1")
                                               )

RecoEcal/EgammaClusterProducers/python/gsFixedSuperClustering_cff.py

@@ -10,7 +10,7 @@
 particleFlowRecHitECALGSFixed=RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff.particleFlowRecHitECAL.clone()
 particleFlowRecHitPSGSFixed=RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff.particleFlowRecHitPS.clone()
 
-particleFlowRecHitECALGSFixed.producers[0].src=cms.InputTag("ecalMultiAndGSWeightRecHitEB")
+particleFlowRecHitECALGSFixed.producers[0].src=cms.InputTag("ecalMultiAndGSGlobalRecHitEB")
 particleFlowRecHitECALGSFixed.producers[1].src=cms.InputTag("reducedEcalRecHitsEE")
 particleFlowRecHitPSGSFixed.producers[0].src=cms.InputTag("reducedEcalRecHitsES")
 
@@ -22,14 +22,14 @@
 particleFlowClusterECALUncorrectedGSFixed.recHitsSource = cms.InputTag("particleFlowRecHitECALGSFixed")
 
 particleFlowClusterECALGSFixed = RecoParticleFlow.PFClusterProducer.particleFlowCluster_cff.particleFlowClusterECAL.clone()
-particleFlowClusterECALGSFixed.energyCorrector.recHitsEBLabel=cms.InputTag("ecalMultiAndGSWeightRecHitEB")
+particleFlowClusterECALGSFixed.energyCorrector.recHitsEBLabel=cms.InputTag("ecalMultiAndGSGlobalRecHitEB")
 particleFlowClusterECALGSFixed.energyCorrector.recHitsEELabel=cms.InputTag("reducedEcalRecHitsEE")
 particleFlowClusterECALGSFixed.inputECAL = cms.InputTag("particleFlowClusterECALUncorrectedGSFixed")
 particleFlowClusterECALGSFixed.inputPS = cms.InputTag("particleFlowClusterPSGSFixed")
 
 import RecoEcal.EgammaClusterProducers.particleFlowSuperClusteringSequence_cff
 particleFlowSuperClusterECALGSFixed=RecoEcal.EgammaClusterProducers.particleFlowSuperClusteringSequence_cff.particleFlowSuperClusterECAL.clone()
-particleFlowSuperClusterECALGSFixed.regressionConfig.ecalRecHitsEB=cms.InputTag("ecalMultiAndGSWeightRecHitEB")
+particleFlowSuperClusterECALGSFixed.regressionConfig.ecalRecHitsEB=cms.InputTag("ecalMultiAndGSGlobalRecHitEB")
 particleFlowSuperClusterECALGSFixed.regressionConfig.ecalRecHitsEE=cms.InputTag("reducedEcalRecHitsEE")
 particleFlowSuperClusterECALGSFixed.PFClusters = cms.InputTag("particleFlowClusterECALGSFixed")
 particleFlowSuperClusterECALGSFixed.ESAssociation = cms.InputTag("particleFlowClusterECALGSFixed")

RecoEgamma/EgammaElectronProducers/python/gsFixedGsfElectrons_cfi.py

@@ -4,6 +4,6 @@
 gsFixedGsfElectrons = cms.EDProducer("GsfElectronGSCrysFixer",
     newCores=cms.InputTag("gsFixedGsfElectronCores"),
     oldEles=cms.InputTag("gedGsfElectrons", '', cms.InputTag.skipCurrentProcess()),
-    ebRecHits=cms.InputTag("ecalMultiAndGSWeightRecHitEB"),
+    ebRecHits=cms.InputTag("ecalMultiAndGSGlobalRecHitEB"),
     regressionConfig = regressionModifier.clone(rhoCollection=cms.InputTag("fixedGridRhoFastjetAllTmp")),
 )

RecoEgamma/EgammaElectronProducers/python/gsSimpleFixedGsfElectrons_cfi.py

@@ -4,5 +4,5 @@
 gsSimpleFixedGsfElectrons = cms.EDProducer("GsfEleGSCrysSimpleFixer",
                                            oldEles = cms.InputTag("gedGsfElectrons"),
                                            ebMultiRecHits = cms.InputTag("reducedEcalRecHitsEB"),
-                                           ebMultiAndWeightsRecHits = cms.InputTag("ecalMultiAndGSWeightRecHitEB"),
+                                           ebMultiAndWeightsRecHits = cms.InputTag("ecalMultiAndGSGlobalRecHitEB"),
 )

RecoEgamma/EgammaElectronProducers/python/gsSimpleFixedPhotons_cfi.py

@@ -4,7 +4,7 @@
 gsSimpleFixedPhotons = cms.EDProducer("PhotonGSCrysSimpleFixer",
                                               oldPhos = cms.InputTag("gedPhotons"),
                                       ebMultiRecHits = cms.InputTag("reducedEcalRecHitsEB"),
-                                      ebMultiAndWeightsRecHits = cms.InputTag("ecalMultiAndGSWeightRecHitEB"),
+                                      ebMultiAndWeightsRecHits = cms.InputTag("ecalMultiAndGSGlobalRecHitEB"),
                                       energyTypesToFix = cms.vstring("ecal_standard","ecal_photons","regression1","regression2"),
                                       energyTypeForP4 = cms.string("regression2")
 )

RecoEgamma/EgammaPhotonProducers/python/gsFixedGEDPhotons_cfi.py

@@ -5,7 +5,7 @@
 gsFixedGEDPhotons = cms.EDProducer('GEDPhotonGSCrysFixer',
     photons = cms.InputTag('gedPhotons', '', cms.InputTag.skipCurrentProcess()),
     newCores = cms.InputTag('gsFixedGEDPhotonCores'),
-    barrelEcalHits=cms.InputTag("ecalMultiAndGSWeightRecHitEB"),
+    barrelEcalHits=cms.InputTag("ecalMultiAndGSGlobalRecHitEB"),
     primaryVertexProducer = cms.InputTag('offlinePrimaryVerticesWithBS'),
     # rest for regression
     minR9Barrel = cms.double(0.94),

RecoEgamma/EgammaTools/python/ecalGlobalRecHitFromSelectedDigis_cff.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+import RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi
+
+ecalGlobalUncalibRecHitSelectedDigis = RecoLocalCalo.EcalRecProducers.ecalGlobalUncalibRecHit_cfi.ecalGlobalUncalibRecHit.clone()
+ecalGlobalUncalibRecHitSelectedDigis.EBdigiCollection = cms.InputTag("selectDigi","selectedEcalEBDigiCollection")
+ecalGlobalUncalibRecHitSelectedDigis.EEdigiCollection = cms.InputTag("selectDigi","selectedEcalEEDigiCollection")
+
+import RecoLocalCalo.EcalRecProducers.ecalRecHit_cfi
+ecalGlobalRecHitSelectedDigis = RecoLocalCalo.EcalRecProducers.ecalRecHit_cfi.ecalRecHit.clone()
+ecalGlobalRecHitSelectedDigis.EEuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHitSelectedDigis","EcalUncalibRecHitsEE")
+ecalGlobalRecHitSelectedDigis.EBuncalibRecHitCollection = cms.InputTag("ecalGlobalUncalibRecHitSelectedDigis","EcalUncalibRecHitsEB")
+ecalGlobalRecHitSelectedDigis.recoverEBFE = cms.bool(False)
+ecalGlobalRecHitSelectedDigis.recoverEEFE = cms.bool(False)
+ecalGlobalRecHitSelectedDigis.killDeadChannels = cms.bool(False)
+
+ecalGlobalLocalRecoFromSelectedDigis =cms.Sequence(ecalGlobalUncalibRecHitSelectedDigis*
+                                                   ecalGlobalRecHitSelectedDigis)
+

RecoEgamma/EgammaTools/python/egammaGainSwitchFixTools.py

@@ -40,7 +40,7 @@ def replaceModulesInSeq(process,seq,names_dict):
 
 def customiseForAODGainSwitchFix(process,newNameSuffex=""):
     process.load("RecoEgamma.EgammaTools.egammaGainSwitchFix_cff")
-    names_dict = {"ecalMultiAndGSWeightRecHitEB" : "reducedEcalRecHitsEB" + newNameSuffex,
+    names_dict = {"ecalMultiAndGSGlobalRecHitEB" : "reducedEcalRecHitsEB" + newNameSuffex,
                   "particleFlowRecHitECALGSFixed" : "particleFlowRecHitECAL" + newNameSuffex,
                   "particleFlowRecHitPSGSFixed" : "particleFlowRecHitPS" + newNameSuffex,
                   "particleFlowClusterPSGSFixed" : "particleFlowClusterPS" + newNameSuffex,

RecoEgamma/EgammaTools/python/egammaGainSwitchFixToolsForPAT_cff.py

@@ -127,7 +127,7 @@ def customizeGSFixForPAT(process):
         cms.InputTag("PhotonCutBasedIDLooseEMGSFixed"),    
         cms.InputTag("PhotonCutBasedIDTightGSFixed")
         )
-    process.reducedEgamma.barrelEcalHits = cms.InputTag("ecalMultiAndGSWeightRecHitEB")
+    process.reducedEgamma.barrelEcalHits = cms.InputTag("ecalMultiAndGSGlobalRecHitEB")
     process.reducedEgamma.endcapEcalHits = cms.InputTag("reducedEcalRecHitsEE")
     process.reducedEgamma.preshowerEcalHits = cms.InputTag("reducedEcalRecHitsES")
 

RecoEgamma/EgammaTools/python/egammaGainSwitchFix_cff.py

@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms 
 
-#this module re-makes the rec-hits using the weights reco for hits saved in ecal selected digis 
-from RecoEgamma.EgammaTools.ecalWeightRecHitFromSelectedDigis_cff import *
+#this module re-makes the rec-hits using the global (weights+ratio) reco for hits saved in ecal selected digis 
+from RecoEgamma.EgammaTools.ecalGlobalRecHitFromSelectedDigis_cff import *
 #this module makes a new collection of barrel rechits where gain switched multifit crystals are swapped
 #with weights reco hits if availible
-from RecoEcal.EgammaClusterProducers.ecalMultiAndGSWeightRecHitEB_cfi import *
+from RecoEcal.EgammaClusterProducers.ecalMultiAndGSGlobalRecHitEB_cfi import *
 #this sequence re-runs PF clustering with "GSFixed" suffext
 from RecoEcal.EgammaClusterProducers.gsFixedSuperClustering_cff import *
 #this module remakes the refined EGamma superclusters although it has to approximate them as there is not
@@ -20,8 +20,8 @@
 from RecoEgamma.EgammaPhotonProducers.gsFixedGEDPhotons_cfi import *
 
 egammaGainSwitchLocalFixSequence = cms.Sequence(
-    ecalWeightLocalRecoFromSelectedDigis*
-    ecalMultiAndGSWeightRecHitEB
+    ecalGlobalLocalRecoFromSelectedDigis*
+    ecalMultiAndGSGlobalRecHitEB
 )
 
 egammaGainSwitchFixSequence = cms.Sequence(

RecoEgamma/EgammaTools/python/egammaGainSwitchFlag_cff.py

@@ -2,8 +2,8 @@
 
 PhotonGainSwitchFlagProducer = cms.EDProducer('PhotonGainSwitchFlagProducer',
                                               src = cms.InputTag('reducedEgamma','reducedGedPhotons'),
-                                              ebRecHits = cms.InputTag('ecalMultiAndGSWeightRecHitEB'))
+                                              ebRecHits = cms.InputTag('ecalMultiAndGSGlobalRecHitEB'))
 
 ElectronGainSwitchFlagProducer = cms.EDProducer('ElectronGainSwitchFlagProducer',
                                                 src = cms.InputTag('reducedEgamma', 'reducedGedGsfElectrons'),
-                                                ebRecHits = cms.InputTag('ecalMultiAndGSWeightRecHitEB'))
+                                                ebRecHits = cms.InputTag('ecalMultiAndGSGlobalRecHitEB'))