Skip to content
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

Jump to bottom

add bunch crossing as index to pixel counters #8944

Merged
merged 2 commits into from May 5, 2015
Merged

add bunch crossing as index to pixel counters #8944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fdd24f
add bunch crossing as index to pixel counters
capalmer85 May 3, 2015
b5ace6a
BUG fix... need to reset firstEvent to false after first event
capalmer85 May 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 28 additions & 19 deletions RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.cc
View file
Open in desktop
Expand Up @@ -72,8 +72,10 @@ PCCNTupler::PCCNTupler(edm::ParameterSet const& iConfig):

if(includePixels){
tree->Branch("BXNo","map<int,int>",&BXNo);
tree->Branch("nPixelClusters","map<int,int>",&nPixelClusters);
tree->Branch("nClusters","map<int,int>",&nClusters);
tree->Branch("nPixelClusters","map<std::pair<int,int>,int>",&nPixelClusters);
tree->Branch("nClusters", "map<std::pair<int,int>,int>",&nClusters);
//tree->Branch("nPixelClusters","map<int,int>",&nPixelClusters);
//tree->Branch("nClusters","map<int,int>",&nClusters);
tree->Branch("layers","map<int,int>",&layers);
// dead modules
nDeadModules = 6;
Expand Down Expand Up @@ -133,7 +135,8 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
saveAndReset = (saveType=="LumiSect" && !sameLumiSect)
|| (saveType=="LumiNib" && !sameLumiNib)
|| (saveType=="Event" && !sameEvent);



if( !saveAndReset && !sameLumiSect
&& !sameLumiNib && !sameEvent) {
std::cout<<"Diff LS, LN and Event, but not saving/resetting..."<<std::endl;
Expand All @@ -148,6 +151,7 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
layers.clear();
BXNo.clear();
nGoodVtx.clear();
firstEvent=false;
}

if(sampleType=="MC"){
Expand All @@ -164,25 +168,29 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
}

// Get the Run, Lumi Section, and Event numbers, etc.
runNo = iEvent.id().run();
LSNo = iEvent.getLuminosityBlock().luminosityBlock();
LNNo = -99; // FIXME need the luminibble
runNo = iEvent.id().run();
LSNo = iEvent.getLuminosityBlock().luminosityBlock();
LNNo = -99; // FIXME need the luminibble
eventNo = iEvent.id().event();
bxNo = iEvent.bunchCrossing();
timeStamp = iEvent.time().unixTime();

bxModKey.first=bxNo;
bxModKey.second=-1;

if((BXNo.count(iEvent.bunchCrossing())==0||nGoodVtx.count(iEvent.bunchCrossing())==0) && !(BXNo.count(iEvent.bunchCrossing())==0&&nGoodVtx.count(iEvent.bunchCrossing())==0)){
if((BXNo.count(bxNo)==0||nGoodVtx.count(bxNo)==0) && !(BXNo.count(bxNo)==0&&nGoodVtx.count(bxNo)==0)){
std::cout<<"BXNo and nGoodVtx should have the same keys but DO NOT!!!"<<std::endl;
}

if(BXNo.count(iEvent.bunchCrossing())==0){
BXNo[iEvent.bunchCrossing()]=0;
if(BXNo.count(bxNo)==0){
BXNo[bxNo]=0;
}

if(nGoodVtx.count(iEvent.bunchCrossing())==0){
nGoodVtx[iEvent.bunchCrossing()]=0;
if(nGoodVtx.count(bxNo)==0){
nGoodVtx[bxNo]=0;
}

BXNo[iEvent.bunchCrossing()]=BXNo[iEvent.bunchCrossing()]+1;
BXNo[bxNo]=BXNo[bxNo]+1;
// add the vertex information

xV = -9999.; yV = -9999.; zV = -9999.; chi2 = -9999.; ndof = -9999;
Expand All @@ -199,7 +207,7 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
if(nd > 4 && v->isValid() && (v->isFake() == 0)){
nVtx++;
if(nnTrk > 0){
nGoodVtx[iEvent.bunchCrossing()]=nGoodVtx[iEvent.bunchCrossing()]+1;
nGoodVtx[bxNo]=nGoodVtx[bxNo]+1;
if(nnTrk > nTrk){
nTrk = nnTrk;
//FIXME why are we multiplying by 10000 or 10?
Expand Down Expand Up @@ -245,23 +253,24 @@ void PCCNTupler::analyze(const edm::Event& iEvent,
//if (dynamic_cast<PixelGeomDetUnit*>((*it)) != 0){
DetId detId = (*it)->geographicalId();

bxModKey.second=detId();

// -- clusters on this det
edmNew::DetSetVector<SiPixelCluster>::const_iterator isearch = clustColl.find(detId);
if (isearch != clustColl.end()) { // Not an empty iterator
edmNew::DetSet<SiPixelCluster>::const_iterator di;
for (di = isearch->begin(); di != isearch->end(); ++di) {
if(nPixelClusters.count(detId())==0){
nPixelClusters[detId()]=0;
if(nPixelClusters.count(bxModKey)==0){
nPixelClusters[bxModKey]=0;
}
nPixelClusters[detId()] = nPixelClusters[detId()]+1;
nPixelClusters[bxModKey] = nPixelClusters[bxModKey]+1;
}

int nCluster = isearch->size();
if(nClusters.count(detId())==0){
nClusters[detId()]=0;
if(nClusters.count(bxModKey)==0){
nClusters[bxModKey]=0;
}
nClusters[detId()] += nCluster;
nClusters[bxModKey] += nCluster;

if (detId.subdetId() == PixelSubdetector::PixelBarrel) {
PixelBarrelName detName = PixelBarrelName(detId);
Expand Down
7 changes: 5 additions & 2 deletions RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h
View file
Open in desktop
Expand Up @@ -122,15 +122,18 @@ class PCCNTupler : public edm::one::EDAnalyzer<edm::one::SharedResources, edm::o
int LSNo=-99; // set to indicate first pass of analyze method
int LNNo=-99; // set to indicate first pass of analyze method
int eventNo=-99; // set to indicate first pass of analyze method
int bxNo=-99; // local variable only

std::pair<int,int> bxModKey; // local variable only

int eventCounter=0;
int totalEvents;

bool includeVertexInformation, includePixels;
int nVtx, nTrk, ndof;
std::map<int,int> nGoodVtx;
std::map<int,int> nPixelClusters;
std::map<int,int> nClusters;
std::map<std::pair<int,int>,int> nPixelClusters;
std::map<std::pair<int,int>,int> nClusters;
std::map<int,int> layers;

TH1F* pileup;
Expand Down