Skip to content

Fully working now in CMSSW_7_3_4 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
previsualconsent wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fully working now in CMSSW_7_3_4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf6d2b3
update globaltag
TENorbert Mar 15, 2015
4f2c886
update globaltag
TENorbert Mar 15, 2015
5c77599
Updated function calls to work in CMSSW_7_3_4
previsualconsent Mar 19, 2015
3d6c0d7
Merge branch 'master' of github.com:TENorbert/CalibCalorimetry
previsualconsent Mar 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EcalTiming/interface/EcalTimeTreeContent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 15 additions & 14 deletions EcalTiming/plugins/EcalTimeEleTreeMaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ using namespace std ;


EcalTimeEleTreeMaker::EcalTimeEleTreeMaker (const edm::ParameterSet& iConfig) :
barrelEcalRecHitCollection_ (iConfig.getParameter<edm::InputTag> ("barrelEcalRecHitCollection")),
endcapEcalRecHitCollection_ (iConfig.getParameter<edm::InputTag> ("endcapEcalRecHitCollection")),
barrelBasicClusterCollection_ (iConfig.getParameter<edm::InputTag> ("barrelBasicClusterCollection")),
endcapBasicClusterCollection_ (iConfig.getParameter<edm::InputTag> ("endcapBasicClusterCollection")),
barrelSuperClusterCollection_ (iConfig.getParameter<edm::InputTag> ("barrelSuperClusterCollection")),
Expand All @@ -91,9 +89,12 @@ EcalTimeEleTreeMaker::EcalTimeEleTreeMaker (const edm::ParameterSet& iConfig) :
workingPoint_ (iConfig.getParameter<std::string> ("eleWorkingPoint")),
naiveId_ (0)
{
barrelEcalRecHitCollection_ = consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag> ("barrelEcalRecHitCollection"));
endcapEcalRecHitCollection_ = consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag> ("endcapEcalRecHitCollection"));
// TrackAssociator parameters // gfwork: can we remove this?
//edm::ParameterSet trkParameters = iConfig.getParameter<edm::ParameterSet> ("TrackAssociatorParameters") ;
//trackParameters_.loadParameters ( trkParameters ) ;
edm::ParameterSet trkParameters = iConfig.getParameter<edm::ParameterSet> ("TrackAssociatorParameters") ;
edm::ConsumesCollector iC = consumesCollector();
trackParameters_.loadParameters ( trkParameters ,iC) ;
//trackAssociator_.useDefaultPropagator () ;

// Create File
Expand Down Expand Up @@ -137,30 +138,28 @@ void EcalTimeEleTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSe
// Ecal barrel RecHits
edm::Handle<EcalRecHitCollection> 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 ;
}


// Ecal endcap RecHits
edm::Handle<EcalRecHitCollection> 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 ;
}

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions EcalTiming/plugins/EcalTimeEleTreeMaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ class EcalTimeEleTreeMaker : public edm::EDAnalyzer

protected:

edm::InputTag barrelEcalRecHitCollection_ ;
edm::InputTag endcapEcalRecHitCollection_ ;
edm::EDGetTokenT<EcalRecHitCollection> barrelEcalRecHitCollection_ ;
edm::EDGetTokenT<EcalRecHitCollection> endcapEcalRecHitCollection_ ;
edm::InputTag barrelBasicClusterCollection_ ;
edm::InputTag endcapBasicClusterCollection_ ;
edm::InputTag barrelSuperClusterCollection_ ;
Expand Down
28 changes: 15 additions & 13 deletions EcalTiming/plugins/EcalTimeTreeMaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ using namespace std ;
#define FILL_SHAPE_VARS 0

EcalTimeTreeMaker::EcalTimeTreeMaker (const edm::ParameterSet& iConfig) :
barrelEcalRecHitCollection_ (iConfig.getParameter<edm::InputTag> ("barrelEcalRecHitCollection")),
endcapEcalRecHitCollection_ (iConfig.getParameter<edm::InputTag> ("endcapEcalRecHitCollection")),
barrelBasicClusterCollection_ (iConfig.getParameter<edm::InputTag> ("barrelBasicClusterCollection")),
endcapBasicClusterCollection_ (iConfig.getParameter<edm::InputTag> ("endcapBasicClusterCollection")),
barrelSuperClusterCollection_ (iConfig.getParameter<edm::InputTag> ("barrelSuperClusterCollection")),
Expand All @@ -79,9 +77,13 @@ EcalTimeTreeMaker::EcalTimeTreeMaker (const edm::ParameterSet& iConfig) :
naiveId_ (0)

{
barrelEcalRecHitCollection_ = consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag> ("barrelEcalRecHitCollection"));
endcapEcalRecHitCollection_ = consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag> ("endcapEcalRecHitCollection"));

// TrackAssociator parameters // gfwork: can we remove this?
edm::ParameterSet trkParameters = iConfig.getParameter<edm::ParameterSet> ("TrackAssociatorParameters") ;
trackParameters_.loadParameters ( trkParameters ) ;
edm::ConsumesCollector iC = consumesCollector();
trackParameters_.loadParameters ( trkParameters ,iC) ;

// Create File
fileName_ += "_"+intToString (runNum_)+".root" ;
Expand Down Expand Up @@ -123,30 +125,28 @@ void EcalTimeTreeMaker::analyze (const edm::Event& iEvent, const edm::EventSetup
// Ecal barrel RecHits
edm::Handle<EcalRecHitCollection> 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 ;
}


// Ecal endcap RecHits
edm::Handle<EcalRecHitCollection> 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 ;
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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.;
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions EcalTiming/plugins/EcalTimeTreeMaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ class EcalTimeTreeMaker : public edm::EDAnalyzer

protected:

edm::InputTag barrelEcalRecHitCollection_ ;
edm::InputTag endcapEcalRecHitCollection_ ;
edm::EDGetTokenT<EcalRecHitCollection> barrelEcalRecHitCollection_ ;
edm::EDGetTokenT<EcalRecHitCollection> endcapEcalRecHitCollection_ ;
edm::InputTag barrelBasicClusterCollection_ ;
edm::InputTag endcapBasicClusterCollection_ ;
edm::InputTag barrelSuperClusterCollection_ ;
Expand Down
7 changes: 5 additions & 2 deletions EcalTiming/python/ecalCreateTimeCalibrations_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion EcalTiming/python/ecalCreateTimeCalibsAndValidate_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand Down
6 changes: 3 additions & 3 deletions EcalTiming/src/EcalTimeTreeContent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}}

Expand Down