diff --git a/EcalTiming/interface/EcalTimeTreeContent.h b/EcalTiming/interface/EcalTimeTreeContent.h index 81040ed..4655f75 100644 --- a/EcalTiming/interface/EcalTimeTreeContent.h +++ b/EcalTiming/interface/EcalTimeTreeContent.h @@ -125,7 +125,7 @@ struct EcalTimeTreeContent float xtalInBCTimeErr[MAXC][MAXXTALINC]; float xtalInBCAmplitudeADC[MAXC][MAXXTALINC]; float xtalInBCChi2[MAXC][MAXXTALINC]; - float xtalInBCOutOfTimeChi2[MAXC][MAXXTALINC]; + //float xtalInBCOutOfTimeChi2[MAXC][MAXXTALINC]; float xtalInBCSwissCross[MAXC][MAXXTALINC]; // vertex variables diff --git a/EcalTiming/plugins/EcalTimeEleTreeMaker.cc b/EcalTiming/plugins/EcalTimeEleTreeMaker.cc index d8bfae8..dabc67e 100644 --- a/EcalTiming/plugins/EcalTimeEleTreeMaker.cc +++ b/EcalTiming/plugins/EcalTimeEleTreeMaker.cc @@ -73,8 +73,6 @@ using namespace std ; EcalTimeEleTreeMaker::EcalTimeEleTreeMaker (const edm::ParameterSet& iConfig) : - barrelEcalRecHitCollection_ (iConfig.getParameter ("barrelEcalRecHitCollection")), - endcapEcalRecHitCollection_ (iConfig.getParameter ("endcapEcalRecHitCollection")), barrelBasicClusterCollection_ (iConfig.getParameter ("barrelBasicClusterCollection")), endcapBasicClusterCollection_ (iConfig.getParameter ("endcapBasicClusterCollection")), barrelSuperClusterCollection_ (iConfig.getParameter ("barrelSuperClusterCollection")), @@ -91,9 +89,12 @@ EcalTimeEleTreeMaker::EcalTimeEleTreeMaker (const edm::ParameterSet& iConfig) : workingPoint_ (iConfig.getParameter ("eleWorkingPoint")), naiveId_ (0) { + barrelEcalRecHitCollection_ = consumes(iConfig.getParameter ("barrelEcalRecHitCollection")); + endcapEcalRecHitCollection_ = consumes(iConfig.getParameter ("endcapEcalRecHitCollection")); // TrackAssociator parameters // gfwork: can we remove this? - //edm::ParameterSet trkParameters = iConfig.getParameter ("TrackAssociatorParameters") ; - //trackParameters_.loadParameters ( trkParameters ) ; + edm::ParameterSet trkParameters = iConfig.getParameter ("TrackAssociatorParameters") ; + edm::ConsumesCollector iC = consumesCollector(); + trackParameters_.loadParameters ( trkParameters ,iC) ; //trackAssociator_.useDefaultPropagator () ; // Create File @@ -137,14 +138,13 @@ void EcalTimeEleTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSe // Ecal barrel RecHits edm::Handle pBarrelEcalRecHits ; const EcalRecHitCollection* theBarrelEcalRecHits = 0; - if( iEvent.getByLabel (barrelEcalRecHitCollection_, pBarrelEcalRecHits) && pBarrelEcalRecHits.isValid ()) + if( iEvent.getByToken (barrelEcalRecHitCollection_, pBarrelEcalRecHits) && pBarrelEcalRecHits.isValid ()) { theBarrelEcalRecHits = pBarrelEcalRecHits.product () ; } if (! (pBarrelEcalRecHits.isValid ()) ) { - LogWarning ("EcalTimeEleTreeMaker") << barrelEcalRecHitCollection_ - << " not available" ; + LogWarning ("EcalTimeEleTreeMaker") << "barrelEcalRecHitCollection not available" ; return ; } @@ -152,15 +152,14 @@ void EcalTimeEleTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSe // Ecal endcap RecHits edm::Handle pEndcapEcalRecHits ; const EcalRecHitCollection* theEndcapEcalRecHits = 0; - if( iEvent.getByLabel (endcapEcalRecHitCollection_, pEndcapEcalRecHits) && pEndcapEcalRecHits.isValid ()) + if( iEvent.getByToken (endcapEcalRecHitCollection_, pEndcapEcalRecHits) && pEndcapEcalRecHits.isValid ()) { theEndcapEcalRecHits = pEndcapEcalRecHits.product () ; } if (! (pEndcapEcalRecHits.isValid ())) { - LogWarning ("EcalTimeEleTreeMaker") << endcapEcalRecHitCollection_ - << " not available" ; + LogWarning ("EcalTimeEleTreeMaker") << "endcapEcalRecHitCollection not available" ; return ; } @@ -431,7 +430,8 @@ void EcalTimeEleTreeMaker::dumpBarrelClusterInfo (const edm::Event& iEvent, // thisamp is the EB amplitude of the current rechit double thisamp = myhit.energy () ; double thisChi2 = myhit.chi2 (); - double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); + // this function removed in CMSSW_7_X_Y + //double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); EcalIntercalibConstantMap::const_iterator icalit = icalMap.find(detitr->first); @@ -483,7 +483,7 @@ void EcalTimeEleTreeMaker::dumpBarrelClusterInfo (const edm::Event& iEvent, myTreeVariables_.xtalInBCFlag[numberOfClusters][numberOfXtalsInCluster]= myhit.recoFlag(); myTreeVariables_.xtalInBCAmplitudeADC[numberOfClusters][numberOfXtalsInCluster]= (float) thisamp/(icalconst*lasercalib*adcToGeV); myTreeVariables_.xtalInBCChi2[numberOfClusters][numberOfXtalsInCluster]= thisChi2; - myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; + //myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; // note: SwissCross = 1 - E4/E1 myTreeVariables_.xtalInBCSwissCross[numberOfClusters][numberOfXtalsInCluster] = EcalTools::swissCross(detitr->first,*theBarrelEcalRecHits,0.5); @@ -679,7 +679,8 @@ void EcalTimeEleTreeMaker::dumpEndcapClusterInfo (const edm::Event& iEvent, double thisamp = myhit.energy () ; double thistime = myhit.time (); double thisChi2 = myhit.chi2 (); - double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); + // this function removed in CMSSW_7_X_Y + //double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); EcalIntercalibConstantMap::const_iterator icalit = icalMap.find(detitr->first); @@ -733,7 +734,7 @@ void EcalTimeEleTreeMaker::dumpEndcapClusterInfo (const edm::Event& iEvent, myTreeVariables_.xtalInBCFlag[numberOfClusters][numberOfXtalsInCluster]= myhit.recoFlag(); myTreeVariables_.xtalInBCAmplitudeADC[numberOfClusters][numberOfXtalsInCluster]= (float) thisamp/(icalconst*lasercalib*adcToGeV); myTreeVariables_.xtalInBCChi2[numberOfClusters][numberOfXtalsInCluster]= thisChi2; - myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; + //myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; myTreeVariables_.xtalInBCSwissCross[numberOfClusters][numberOfXtalsInCluster] = EcalTools::swissCross(detitr->first,*theEndcapEcalRecHits,0.5); diff --git a/EcalTiming/plugins/EcalTimeEleTreeMaker.h b/EcalTiming/plugins/EcalTimeEleTreeMaker.h index 407dcaa..2148450 100644 --- a/EcalTiming/plugins/EcalTimeEleTreeMaker.h +++ b/EcalTiming/plugins/EcalTimeEleTreeMaker.h @@ -170,8 +170,8 @@ class EcalTimeEleTreeMaker : public edm::EDAnalyzer protected: - edm::InputTag barrelEcalRecHitCollection_ ; - edm::InputTag endcapEcalRecHitCollection_ ; + edm::EDGetTokenT barrelEcalRecHitCollection_ ; + edm::EDGetTokenT endcapEcalRecHitCollection_ ; edm::InputTag barrelBasicClusterCollection_ ; edm::InputTag endcapBasicClusterCollection_ ; edm::InputTag barrelSuperClusterCollection_ ; diff --git a/EcalTiming/plugins/EcalTimeTreeMaker.cc b/EcalTiming/plugins/EcalTimeTreeMaker.cc index 42f61d9..2419c70 100644 --- a/EcalTiming/plugins/EcalTimeTreeMaker.cc +++ b/EcalTiming/plugins/EcalTimeTreeMaker.cc @@ -62,8 +62,6 @@ using namespace std ; #define FILL_SHAPE_VARS 0 EcalTimeTreeMaker::EcalTimeTreeMaker (const edm::ParameterSet& iConfig) : - barrelEcalRecHitCollection_ (iConfig.getParameter ("barrelEcalRecHitCollection")), - endcapEcalRecHitCollection_ (iConfig.getParameter ("endcapEcalRecHitCollection")), barrelBasicClusterCollection_ (iConfig.getParameter ("barrelBasicClusterCollection")), endcapBasicClusterCollection_ (iConfig.getParameter ("endcapBasicClusterCollection")), barrelSuperClusterCollection_ (iConfig.getParameter ("barrelSuperClusterCollection")), @@ -79,9 +77,13 @@ EcalTimeTreeMaker::EcalTimeTreeMaker (const edm::ParameterSet& iConfig) : naiveId_ (0) { + barrelEcalRecHitCollection_ = consumes(iConfig.getParameter ("barrelEcalRecHitCollection")); + endcapEcalRecHitCollection_ = consumes(iConfig.getParameter ("endcapEcalRecHitCollection")); + // TrackAssociator parameters // gfwork: can we remove this? edm::ParameterSet trkParameters = iConfig.getParameter ("TrackAssociatorParameters") ; - trackParameters_.loadParameters ( trkParameters ) ; + edm::ConsumesCollector iC = consumesCollector(); + trackParameters_.loadParameters ( trkParameters ,iC) ; // Create File fileName_ += "_"+intToString (runNum_)+".root" ; @@ -123,14 +125,13 @@ void EcalTimeTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSetup // Ecal barrel RecHits edm::Handle pBarrelEcalRecHits ; const EcalRecHitCollection* theBarrelEcalRecHits = 0; - if( iEvent.getByLabel (barrelEcalRecHitCollection_, pBarrelEcalRecHits) && pBarrelEcalRecHits.isValid ()) + if( iEvent.getByToken (barrelEcalRecHitCollection_, pBarrelEcalRecHits) && pBarrelEcalRecHits.isValid ()) { theBarrelEcalRecHits = pBarrelEcalRecHits.product () ; } if (! (pBarrelEcalRecHits.isValid ()) ) { - LogWarning ("EcalTimeTreeMaker") << barrelEcalRecHitCollection_ - << " not available" ; + LogWarning ("EcalTimeTreeMaker") << "barrelEcalRecHitCollection not available" ; return ; } @@ -138,15 +139,14 @@ void EcalTimeTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSetup // Ecal endcap RecHits edm::Handle pEndcapEcalRecHits ; const EcalRecHitCollection* theEndcapEcalRecHits = 0; - if( iEvent.getByLabel (endcapEcalRecHitCollection_, pEndcapEcalRecHits) && pEndcapEcalRecHits.isValid ()) + if( iEvent.getByToken (endcapEcalRecHitCollection_, pEndcapEcalRecHits) && pEndcapEcalRecHits.isValid ()) { theEndcapEcalRecHits = pEndcapEcalRecHits.product () ; } if (! (pEndcapEcalRecHits.isValid ())) { - LogWarning ("EcalTimeTreeMaker") << endcapEcalRecHitCollection_ - << " not available" ; + LogWarning ("EcalTimeTreeMaker") << "endcapEcalRecHitCollection not available" ; return ; } @@ -411,7 +411,8 @@ void EcalTimeTreeMaker::dumpBarrelClusterInfo (const edm::Event& iEvent, double thisamp = myhit.energy () ; double thistime = myhit.time (); double thisChi2 = myhit.chi2 (); - double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); + // this function removed in CMSSW_7_X_Y + //double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); EcalIntercalibConstantMap::const_iterator icalit = icalMap.find(detitr->first); @@ -465,7 +466,7 @@ void EcalTimeTreeMaker::dumpBarrelClusterInfo (const edm::Event& iEvent, myTreeVariables_.xtalInBCFlag[numberOfClusters][numberOfXtalsInCluster]= myhit.recoFlag(); myTreeVariables_.xtalInBCAmplitudeADC[numberOfClusters][numberOfXtalsInCluster]= (float) thisamp/(icalconst*lasercalib*adcToGeV); myTreeVariables_.xtalInBCChi2[numberOfClusters][numberOfXtalsInCluster]= thisChi2; - myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; + //myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; // note: SwissCross = 1 - E4/E1 myTreeVariables_.xtalInBCSwissCross[numberOfClusters][numberOfXtalsInCluster] = EcalTools::swissCross(detitr->first,*theBarrelEcalRecHits,0.5); @@ -647,7 +648,8 @@ void EcalTimeTreeMaker::dumpEndcapClusterInfo (const edm::Event& iEvent, double thisamp = myhit.energy () ; double thistime = myhit.time (); double thisChi2 = myhit.chi2 (); - double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); + // this function removed in CMSSW_7_X_Y + //double thisOutOfTimeChi2 = myhit.outOfTimeChi2 (); // get laser coefficient float lasercalib = 1.; @@ -697,7 +699,7 @@ void EcalTimeTreeMaker::dumpEndcapClusterInfo (const edm::Event& iEvent, myTreeVariables_.xtalInBCFlag[numberOfClusters][numberOfXtalsInCluster]= myhit.recoFlag(); myTreeVariables_.xtalInBCAmplitudeADC[numberOfClusters][numberOfXtalsInCluster]= (float) thisamp/(icalconst*lasercalib*adcToGeV); myTreeVariables_.xtalInBCChi2[numberOfClusters][numberOfXtalsInCluster]= thisChi2; - myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; + //myTreeVariables_.xtalInBCOutOfTimeChi2[numberOfClusters][numberOfXtalsInCluster]=thisOutOfTimeChi2; myTreeVariables_.xtalInBCSwissCross[numberOfClusters][numberOfXtalsInCluster] = EcalTools::swissCross(detitr->first,*theEndcapEcalRecHits,0.5); diff --git a/EcalTiming/plugins/EcalTimeTreeMaker.h b/EcalTiming/plugins/EcalTimeTreeMaker.h index 542b2f6..5ad45be 100644 --- a/EcalTiming/plugins/EcalTimeTreeMaker.h +++ b/EcalTiming/plugins/EcalTimeTreeMaker.h @@ -158,8 +158,8 @@ class EcalTimeTreeMaker : public edm::EDAnalyzer protected: - edm::InputTag barrelEcalRecHitCollection_ ; - edm::InputTag endcapEcalRecHitCollection_ ; + edm::EDGetTokenT barrelEcalRecHitCollection_ ; + edm::EDGetTokenT endcapEcalRecHitCollection_ ; edm::InputTag barrelBasicClusterCollection_ ; edm::InputTag endcapBasicClusterCollection_ ; edm::InputTag barrelSuperClusterCollection_ ; diff --git a/EcalTiming/python/ecalCreateTimeCalibrations_cfg.py b/EcalTiming/python/ecalCreateTimeCalibrations_cfg.py index 7483bd6..41f09a9 100644 --- a/EcalTiming/python/ecalCreateTimeCalibrations_cfg.py +++ b/EcalTiming/python/ecalCreateTimeCalibrations_cfg.py @@ -5,7 +5,8 @@ # Global Tag -- for original timing calibrations process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.Geometry_cff") -process.GlobalTag.globaltag = 'GR_R_44_V5::All' +#process.GlobalTag.globaltag = 'GR_R_44_V5::All' +process.GlobalTag.globaltag = 'GR_P_V42::All' process.MessageLogger = cms.Service("MessageLogger", @@ -44,7 +45,9 @@ MinHitTimeEE = cms.double(-7), EventsUsedFractionNum = cms.double(1), EventsUsedFractionDen = cms.double(1), - InputFileNames = cms.vstring('file:/data/jared/data/EcalTiming/DoubleElectron_Run2011A-ZElectron-PromptSkim-v4_RAW-RECO/rh-DoubleElectron_Run2011A-ZElectron-PromptSkim-v4_RAW-RECO-jul15.HADDED.root') + InputFileNames = cms.vstring( + 'file:EcalTimeTree_999999.root' + ) ) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) process.source = cms.Source("EmptySource", diff --git a/EcalTiming/python/ecalCreateTimeCalibsAndValidate_cfg.py b/EcalTiming/python/ecalCreateTimeCalibsAndValidate_cfg.py index e97ca85..1eb45ed 100644 --- a/EcalTiming/python/ecalCreateTimeCalibsAndValidate_cfg.py +++ b/EcalTiming/python/ecalCreateTimeCalibsAndValidate_cfg.py @@ -6,7 +6,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.Geometry_cff") -process.GlobalTag.globaltag = 'GR_R_44_V5::All' +process.GlobalTag.globaltag = 'GR_P_V42::All' process.MessageLogger = cms.Service("MessageLogger", cout = cms.untracked.PSet(threshold = cms.untracked.string('INFO')), diff --git a/EcalTiming/src/EcalTimeTreeContent.cc b/EcalTiming/src/EcalTimeTreeContent.cc index 7f0562b..77f78e9 100644 --- a/EcalTiming/src/EcalTimeTreeContent.cc +++ b/EcalTiming/src/EcalTimeTreeContent.cc @@ -117,7 +117,7 @@ void setBranchAddresses(TTree* chain, EcalTimeTreeContent& treeVars) chain -> SetBranchAddress("xtalInBCTimeErr", treeVars.xtalInBCTimeErr); chain -> SetBranchAddress("xtalInBCAmplitudeADC", treeVars.xtalInBCAmplitudeADC); chain -> SetBranchAddress("xtalInBCChi2", treeVars.xtalInBCChi2); - chain -> SetBranchAddress("xtalInBCOutOfTimeChi2", treeVars.xtalInBCOutOfTimeChi2); + //chain -> SetBranchAddress("xtalInBCOutOfTimeChi2", treeVars.xtalInBCOutOfTimeChi2); chain -> SetBranchAddress("xtalInBCSwissCross", treeVars.xtalInBCSwissCross); } // ECAL VARIABLES @@ -592,7 +592,7 @@ void setBranches(TTree* chain, EcalTimeTreeContent& treeVars) chain -> Branch("xtalInBCTimeErr", treeVars.xtalInBCTimeErr, "xtalInBCTimeErr[nClusters][25]/F"); chain -> Branch("xtalInBCAmplitudeADC", treeVars.xtalInBCAmplitudeADC, "xtalInBCAmplitudeADC[nClusters][25]/F"); chain -> Branch("xtalInBCChi2", treeVars.xtalInBCChi2, "xtalInBCChi2[nClusters][25]/F"); - chain -> Branch("xtalInBCOutOfTimeChi2", treeVars.xtalInBCOutOfTimeChi2, "xtalInBCOutOfTimeChi2[nClusters][25]/F"); + //chain -> Branch("xtalInBCOutOfTimeChi2", treeVars.xtalInBCOutOfTimeChi2, "xtalInBCOutOfTimeChi2[nClusters][25]/F"); chain -> Branch("xtalInBCSwissCross", treeVars.xtalInBCSwissCross, "xtalInBCSwissCross[nClusters][25]/F"); } // ECAL VARIABLES @@ -1063,7 +1063,7 @@ void initializeBranches(TTree* chain, EcalTimeTreeContent& treeVars) treeVars.xtalInBCTimeErr[cl][cryInClu]=0; treeVars.xtalInBCAmplitudeADC[cl][cryInClu]=0; treeVars.xtalInBCChi2[cl][cryInClu]=0; - treeVars.xtalInBCOutOfTimeChi2[cl][cryInClu]=0; + //treeVars.xtalInBCOutOfTimeChi2[cl][cryInClu]=0; treeVars.xtalInBCSwissCross[cl][cryInClu]=0; }}