Skip to content

Commit

Permalink
Phase2 compatibility added
Browse files Browse the repository at this point in the history
  • Loading branch information
@nfilipov
nfilipov committed Feb 27, 2017
1 parent 09601b2 commit 3cb09eb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
23 changes: 8 additions & 15 deletions RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.cc
View file
Expand Up @@ -51,7 +51,8 @@ PCCNTupler::PCCNTupler(edm::ParameterSet const& iConfig):
includeVertexInformation(iConfig.getUntrackedParameter<bool>("includeVertexInformation",1)),
includePixels(iConfig.getUntrackedParameter<bool>("includePixels",1)),
includeJets(iConfig.getUntrackedParameter<bool>("includeJets",0)),
splitByBX(iConfig.getUntrackedParameter<bool>("splitByBX",1))
splitByBX(iConfig.getUntrackedParameter<bool>("splitByBX",1)),
pixelPhase2Geometry(iConfig.getUntrackedParameter<bool>("pixelPhase2Geometry",0))
{
cout << "----------------------------------------------------------------------" << endl;
cout << "--- PCCNTupler constructor" << endl;
Expand Down Expand Up @@ -103,13 +104,6 @@ PCCNTupler::PCCNTupler(edm::ParameterSet const& iConfig):
//tree->Branch("nPixelClusters","map<int,int>",&nPixelClusters);
//tree->Branch("nClusters","map<int,int>",&nClusters);
tree->Branch("layers","map<int,int>",&layers);
// dead modules from Run 1
//deadModules[0] = 302125076;
//deadModules[1] = 302125060;
//deadModules[2] = 302197516;
//deadModules[3] = 344019460;
//deadModules[4] = 344019464;
//deadModules[5] = 344019468;
pixelToken=consumes<edmNew::DetSetVector<SiPixelCluster> >(fPixelClusterLabel);
}

Expand Down Expand Up @@ -316,11 +310,10 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
}
}

// nF - Feb 6th - don't use TG anymore
// -- Does this belong into beginJob()?
ESHandle<TrackerGeometry> TG;
iSetup.get<TrackerDigiGeometryRecord>().get(TG);

int NumPixelBarrelLayers=3;
if(pixelPhase2Geometry){
NumPixelBarrelLayers=4;
}
// -- Pixel cluster
if(includePixels){
edm::Handle< edmNew::DetSetVector<SiPixelCluster> > hClusterColl;
Expand All @@ -335,7 +328,7 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
for (edmNew::DetSetVector<SiPixelCluster>::const_iterator isearch = clustColl.begin(); isearch != clustColl.end(); ++isearch){
// these are sorted by modules so we pick the current one
edmNew::DetSet<SiPixelCluster> mod = *isearch;
if(mod.empty()) {std::cout<<" "<<std::endl; continue; }// skip empty modules (didnt find any)
if(mod.empty()) { continue; }// skip empty modules
DetId detId = mod.id();

bxModKey.second=detId();
Expand Down Expand Up @@ -363,7 +356,7 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
PixelEndcapName detName = PixelEndcapName(detId);
int disk = detName.diskName();
if(layers.count(detId())==0){
layers[detId()]=disk+3;
layers[detId()]=disk+NumPixelBarrelLayers;
}
}
//}
Expand Down
1 change: 1 addition & 0 deletions RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h
View file
Expand Up @@ -100,6 +100,7 @@ class PCCNTupler : public edm::one::EDAnalyzer<edm::one::SharedResources, edm::o
bool includePixels;
bool includeJets;
bool splitByBX;
bool pixelPhase2Geometry;

int nPU;
int nVtx;
Expand Down
18 changes: 11 additions & 7 deletions RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py
View file
Expand Up @@ -16,8 +16,6 @@
process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) )

# -- Database configuration
#process.load("CondCore.DBCommon.CondDBCommon_cfi")
#process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load("CondCore.CondDB.CondDB_cfi")

# -- Conditions
Expand Down Expand Up @@ -58,15 +56,16 @@
globalTag = process.GlobalTag.globaltag,
dumpAllEvents = cms.untracked.int32(0),
vertexCollLabel = cms.untracked.InputTag('offlinePrimaryVertices'),
pixelClusterLabel = cms.untracked.InputTag('siPixelClusters'),
pixelClusterLabel = cms.untracked.InputTag('siPixelClusters'), # even in Phase2, for now.
saveType = cms.untracked.string('Event'), # LumiSect, LumiNib, Event
sampleType = cms.untracked.string('MC'), # MC, DATA
includeVertexInformation = cms.untracked.bool(True),
includePixels = cms.untracked.bool(True),
splitByBX = cms.untracked.bool(True),
L1GTReadoutRecordLabel = cms.untracked.InputTag('gtDigis'),
hltL1GtObjectMap = cms.untracked.InputTag('hltL1GtObjectMap'),
HLTResultsLabel = cms.untracked.InputTag('TriggerResults::HLT')
HLTResultsLabel = cms.untracked.InputTag('TriggerResults::HLT'),
pixelPhase2Geometry = cms.untracked.bool(True),
)

# -- Path
Expand All @@ -82,7 +81,12 @@
secFiles = cms.untracked.vstring()
process.source = cms.Source ("PoolSource",fileNames = readFiles, secondaryFileNames = secFiles)
readFiles.extend([
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/36D3D8CD-3BC2-E611-908A-0025905A6088.root', # 80X file
#'/store/mc/RunIISummer16DR80/MinBias_TuneCUETP8M1_13TeV-pythia8/GEN-SIM-RECO/NoPU_RECO_80X_mcRun2_asymptotic_v14-v1/100000/00150044-D075-E611-AAE8-001E67505A2D.root', # 90X file
#'/store/data/Run2015A/ZeroBias1/RECO/PromptReco-v1/000/250/786/00000/B4CDEBBC-F52A-E511-808D-02163E011CE8.root', # data, havent tried
# Min Bias 90X files with 2023D4 geometry and timing. no pu.
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/28088B65-66C2-E611-BF89-0CC47A7C347A.root',
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/20D68D58-3CC2-E611-B15B-0CC47A4C8F18.root',
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/94242929-30C3-E611-B3E0-0025905B85DC.root',
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/F46D98E7-EAC2-E611-936E-0CC47A7452D0.root',
'/store/relval/CMSSW_9_0_0_pre2/RelValMinBias_14TeV/GEN-SIM-RECO/90X_upgrade2023_realistic_v1_2023D4Timing-v1/10000/36D3D8CD-3BC2-E611-908A-0025905A6088.root',
#'/store/mc/RunIISummer16DR80/MinBias_TuneCUETP8M1_13TeV-pythia8/GEN-SIM-RECO/NoPU_RECO_80X_mcRun2_asymptotic_v14-v1/100000/00150044-D075-E611-AAE8-001E67505A2D.root', # 80X file
#'/store/data/Run2015A/ZeroBias1/RECO/PromptReco-v1/000/250/786/00000/B4CDEBBC-F52A-E511-808D-02163E011CE8.root',
])

0 comments on commit 3cb09eb

Please sign in to comment.