Skip to content

Commit

Permalink
Merge pull request #15397 from manoni/CMSSW_8_1_X_2016-08-08-2300-BX
Browse files Browse the repository at this point in the history 
additional and modified plots for SiStrip and Tracking DQM
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 24, 2016
2 parents 903dfd8 + da7dc21 commit 8deb31f
Show file tree
Hide file tree
Showing 5 changed files with 213 additions and 22 deletions.
7 changes: 7 additions & 0 deletions DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,23 @@ class SiStripMonitorCluster : public DQMEDAnalyzer {
};

MonitorElement* GlobalApvCycleDBxTH2 = 0;
MonitorElement* GlobalDBxTH1 = 0;
MonitorElement* GlobalDBxCycleTH1 = 0;
MonitorElement* GlobalCStripVsCpix = 0;
MonitorElement* GlobalABXTH1_CSCP = 0;
MonitorElement* PixVsStripMultiplicityRegions = 0;
MonitorElement* GlobalMainDiagonalPosition = 0;
MonitorElement* GlobalMainDiagonalPosition_vs_BX = 0;
MonitorElement* GlobalTH2MainDiagonalPosition_vs_BX;
MonitorElement* StripNoise2Cycle = 0;
MonitorElement* StripNoise3Cycle = 0;
MonitorElement* NumberOfPixelClus = 0;
MonitorElement* NumberOfStripClus = 0;
MonitorElement* BPTXrateTrend = 0;
MonitorElement* NclusVsCycleTimeProf2D = 0;
MonitorElement* ClusWidthVsAmpTH2 = 0;
MonitorElement* NumberOfStripClus_vs_BX = 0; // plot n. 3
MonitorElement* NumberOfPixelClus_vs_BX = 0; // plot n. 4

private:

Expand Down
78 changes: 70 additions & 8 deletions DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@
subdetswitchon = cms.bool(True)
),

TH1ABx_CSCP = cms.PSet(
Nbinsx = cms.int32(3565),
xmin = cms.double(0.),
xmax = cms.double(3564),
subdetswitchon = cms.bool(True)
),

TProf2ApvCycleVsDBx = cms.PSet(
Nbinsx = cms.int32(70),
xmin = cms.double(-0.5),
Expand All @@ -204,13 +211,27 @@
globalswitchon = cms.bool(True)
),

TH1DBxGlobal = cms.PSet(
Nbinsx = cms.int32(800),
xmin = cms.double(0.5),
xmax = cms.double(800.5),
globalswitchon = cms.bool(True)
),

TH1DBxCycleGlobal = cms.PSet(
Nbinsx = cms.int32(800),
xmin = cms.double(0.5),
xmax = cms.double(800.5),
globalswitchon = cms.bool(True)
),

TH2CStripVsCpixel = cms.PSet(
Nbinsx = cms.int32(300),
Nbinsx = cms.int32(150),
xmin = cms.double(-0.5),
xmax = cms.double(149999.5),
Nbinsy = cms.int32(60),
xmax = cms.double(74999.5),
Nbinsy = cms.int32(50),
ymin = cms.double(-0.5),
ymax = cms.double(17999.5),
ymax = cms.double(14999.5),
globalswitchon = cms.bool(True)
),

Expand All @@ -235,20 +256,61 @@
xmax = cms.double(2.),
globalswitchon = cms.bool(False)
),
# Nunmber of Cluster in Pixel

TProfMainDiagonalPosition= cms.PSet(
Nbinsx = cms.int32(3565),
xmin = cms.double(0),
xmax = cms.double(3564),
Nbinsy = cms.int32(100),
ymin = cms.double(0.),
ymax = cms.double(2.),
globalswitchon = cms.bool(False)
),

TH2MainDiagonalPosition= cms.PSet(
Nbinsx = cms.int32(3565),
xmin = cms.double(0),
xmax = cms.double(3564),
Nbinsy = cms.int32(100),
ymin = cms.double(0.),
ymax = cms.double(2.),
globalswitchon = cms.bool(False)
),

TH1NClusPx = cms.PSet(
Nbinsx = cms.int32(200),
xmax = cms.double(19999.5),
xmin = cms.double(-0.5)
),

# Number of Cluster in Strip
TH1NClusStrip = cms.PSet(
Nbinsx = cms.int32(600),
xmax = cms.double(119999.5),
Nbinsx = cms.int32(500),
xmax = cms.double(99999.5),
xmin = cms.double(-0.5)
),

#****************************************
TProfNClusStrip = cms.PSet(
Nbinsx = cms.int32(3565),
xmin = cms.double(0),
xmax = cms.double(3564),
Nbinsy = cms.int32(200),
ymin = cms.double(-0.5),
ymax = cms.double(99999.5),
globalswitchon = cms.bool(True)
),

TProfNClusPixel = cms.PSet(
Nbinsx = cms.int32(3565),
xmin = cms.double(0),
xmax = cms.double(3564),
Nbinsy = cms.int32(200),
ymin = cms.double(-0.5),
ymax = cms.double(199999.5),
globalswitchon = cms.bool(True)
),

#****************************************
TH1StripNoise2ApvCycle = cms.PSet(
Nbinsx = cms.int32(70),
xmin = cms.double(-0.5),
Expand Down
142 changes: 132 additions & 10 deletions DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// -*- C++ -*-
// Package: SiStripMonitorCluster
// Class: SiStripMonitorCluster
Expand Down Expand Up @@ -337,6 +338,28 @@ void SiStripMonitorCluster::createMEs(const edm::EventSetup& es , DQMStore::IBoo
GlobalTH2Parameters.getParameter<double>("ymax"));
GlobalApvCycleDBxTH2->setAxisTitle("APV Cycle (Corrected Absolute Bx % 70)",1);
GlobalApvCycleDBxTH2->setAxisTitle("Delta Bunch Crossing Cycle",2);

// plot DeltaBX ***************************
edm::ParameterSet GlobalTH1Parameters = conf_.getParameter<edm::ParameterSet>("TH1DBxGlobal");
HistoName = "DeltaBx";
GlobalDBxTH1 = ibooker.book1D(HistoName,HistoName,
GlobalTH1Parameters.getParameter<int32_t>("Nbinsx"),
GlobalTH1Parameters.getParameter<double>("xmin"),
GlobalTH1Parameters.getParameter<double>("xmax"));
GlobalDBxTH1->setAxisTitle("Delta Bunch Crossing",1);



// plot DeltaBXCycle ***************************
edm::ParameterSet DBxCycle = conf_.getParameter<edm::ParameterSet>("TH1DBxCycleGlobal");
HistoName = "DeltaBxCycle";
GlobalDBxCycleTH1 = ibooker.book1D(HistoName,HistoName,
DBxCycle.getParameter<int32_t>("Nbinsx"),
DBxCycle.getParameter<double>("xmin"),
DBxCycle.getParameter<double>("xmax"));
GlobalDBxCycleTH1->setAxisTitle("Delta Bunch Crossing Cycle",1);


}

if (globalswitchcstripvscpix) {
Expand All @@ -352,6 +375,15 @@ void SiStripMonitorCluster::createMEs(const edm::EventSetup& es , DQMStore::IBoo
GlobalTH2Parameters.getParameter<double>("ymax"));
GlobalCStripVsCpix->setAxisTitle("Strip Clusters",1);
GlobalCStripVsCpix->setAxisTitle("Pix Clusters",2);

// Absolute Bunch Crossing ***********************
edm::ParameterSet GlobalTH1Parameters = conf_.getParameter<edm::ParameterSet>("TH1ABx_CSCP");
HistoName = "AbsoluteBx_CStripVsCpixel";
GlobalABXTH1_CSCP = ibooker.book1D(HistoName,HistoName,
GlobalTH1Parameters.getParameter<int32_t>("Nbinsx"),
GlobalTH1Parameters.getParameter<double>("xmin"),
GlobalTH1Parameters.getParameter<double>("xmax"));
GlobalABXTH1_CSCP->setAxisTitle("Absolute Bunch Crossing",1);
}

if (globalswitchMultiRegions){
Expand Down Expand Up @@ -379,6 +411,36 @@ void SiStripMonitorCluster::createMEs(const edm::EventSetup& es , DQMStore::IBoo
GlobalTH1Parameters.getParameter<double>("xmin"),
GlobalTH1Parameters.getParameter<double>("xmax"));
GlobalMainDiagonalPosition->setAxisTitle("atan(NPix/(k*NStrip))");

//PLOT MainDiagonalPosition_vs_BX ***************************
edm::ParameterSet GlobalTProfParameters = conf_.getParameter<edm::ParameterSet>("TProfMainDiagonalPosition");
HistoName = "MainDiagonalPosition_vs_BX";
GlobalMainDiagonalPosition_vs_BX = ibooker.bookProfile(HistoName, HistoName,
GlobalTProfParameters.getParameter<int32_t>("Nbinsx"),
GlobalTProfParameters.getParameter<double>("xmin"),
GlobalTProfParameters.getParameter<double>("xmax"),
GlobalTProfParameters.getParameter<int32_t>("Nbinsy"),
GlobalTProfParameters.getParameter<double>("ymin"),
GlobalTProfParameters.getParameter<double>("ymax"));

GlobalMainDiagonalPosition_vs_BX->setAxisTitle("Absolute BX", 1);
GlobalMainDiagonalPosition_vs_BX->setAxisTitle("tan^{-1}(NPix/k*NStrip))", 2);


edm::ParameterSet GlobalTH2Parameters = conf_.getParameter<edm::ParameterSet>("TH2MainDiagonalPosition");
HistoName = "TH2MainDiagonalPosition_vs_BX";
GlobalTH2MainDiagonalPosition_vs_BX = ibooker.book2D(HistoName,HistoName,
GlobalTH2Parameters.getParameter<int32_t>("Nbinsx"),
GlobalTH2Parameters.getParameter<double>("xmin"),
GlobalTH2Parameters.getParameter<double>("xmax"),
GlobalTH2Parameters.getParameter<int32_t>("Nbinsy"),
GlobalTH2Parameters.getParameter<double>("ymin"),
GlobalTH2Parameters.getParameter<double>("ymax"));
GlobalTH2MainDiagonalPosition_vs_BX->setAxisTitle("Absolute BX",1);
GlobalTH2MainDiagonalPosition_vs_BX->setAxisTitle("tan^{-1}(NPix/k*NStrip))",2);



}

// TO BE ADDED !!!
Expand Down Expand Up @@ -462,6 +524,35 @@ void SiStripMonitorCluster::createMEs(const edm::EventSetup& es , DQMStore::IBoo
StripCluster.getParameter<double>("xmax"));
NumberOfStripClus->setAxisTitle("# of Clusters in Strip", 1);
NumberOfStripClus->setAxisTitle("Number of Events", 2);

// NumberOfClustersinStrip vs BX PLOT ****************************
edm::ParameterSet StripClusterBX = conf_.getParameter<edm::ParameterSet>("TProfNClusStrip");
HistoName = "NumberOfClustersInStrip_vs_BX";
NumberOfStripClus_vs_BX = ibooker.bookProfile(HistoName, HistoName,
StripClusterBX.getParameter<int32_t>("Nbinsx"),
StripClusterBX.getParameter<double>("xmin"),
StripClusterBX.getParameter<double>("xmax"),
StripClusterBX.getParameter<int32_t>("Nbinsy"),
StripClusterBX.getParameter<double>("ymin"),
StripClusterBX.getParameter<double>("ymax"));

NumberOfStripClus_vs_BX->setAxisTitle("Absolute BX", 1);
NumberOfStripClus_vs_BX->setAxisTitle("# of Clusters in Strip", 2);

// NumberOfClustersinStrip vs BX PLOT ****************************
edm::ParameterSet PixelClusterBX = conf_.getParameter<edm::ParameterSet>("TProfNClusPixel");
HistoName = "NumberOfClustersInPixel_vs_BX";
NumberOfPixelClus_vs_BX = ibooker.bookProfile(HistoName, HistoName,
PixelClusterBX.getParameter<int32_t>("Nbinsx"),
PixelClusterBX.getParameter<double>("xmin"),
PixelClusterBX.getParameter<double>("xmax"),
PixelClusterBX.getParameter<int32_t>("Nbinsy"),
PixelClusterBX.getParameter<double>("ymin"),
PixelClusterBX.getParameter<double>("ymax"));

NumberOfPixelClus_vs_BX->setAxisTitle("Absolute BX", 1);
NumberOfPixelClus_vs_BX->setAxisTitle("# of Clusters in Pixel", 2);

}

}//end of if
Expand Down Expand Up @@ -545,8 +636,9 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe
MultiplicityRegion=FindRegion(NStripClusters,NPixClusters);

if ( passBPTXfilter_ and passPixelDCSfilter_ and passStripDCSfilter_ ) {
if (globalswitchcstripvscpix) GlobalCStripVsCpix->Fill(NStripClusters,NPixClusters);
if (globalswitchcstripvscpix) GlobalCStripVsCpix->Fill(NStripClusters,NPixClusters);
if (globalswitchmaindiagonalposition && NStripClusters > 0) GlobalMainDiagonalPosition->Fill(atan(NPixClusters/(k0*NStripClusters)));

if (globalswitchMultiRegions) PixVsStripMultiplicityRegions->Fill(MultiplicityRegion);
}

Expand Down Expand Up @@ -757,6 +849,12 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe
bool global_histo_filled = false;
bool MultiplicityRegion_Vs_APVcycle_filled=false;

// plot n 2
if ( passBPTXfilter_ and passPixelDCSfilter_ and passStripDCSfilter_ ) {
if (globalswitchcstripvscpix) GlobalABXTH1_CSCP->Fill(tbx%3564);
}
// plot n 2

for (std::map<std::string, SubDetMEs>::iterator it = SubDetMEsMap.begin();
it != SubDetMEsMap.end(); it++) {
std::string sdet = it->first;
Expand All @@ -765,6 +863,7 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe

int the_phase = APVCyclePhaseCollection::invalid;
long long tbx_corr = tbx;


if (SubDetPhasePartMap.find(sdet) != SubDetPhasePartMap.end()) the_phase = apv_phase_collection->getPhase(SubDetPhasePartMap[sdet]);
if(the_phase==APVCyclePhaseCollection::nopartition ||
Expand All @@ -774,12 +873,34 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe
//std::cout << " subdet " << it->first << " not valid" << " MR " << MultiplicityRegion <<std::endl;
}
tbx_corr -= the_phase;

long long dbxincycle = event_history->deltaBXinCycle(the_phase);
//std::cout<<"dbx in cycle: " << dbxincycle << std::endl;
if (globalswitchapvcycledbxth2on && !global_histo_filled) {
GlobalApvCycleDBxTH2->Fill(tbx_corr%70,dbx);
GlobalDBxTH1->Fill(dbx);
GlobalDBxCycleTH1->Fill(dbxincycle);
global_histo_filled = true;
}


// Fill MainDiagonalPosition plots ***************
if (cluster_detsetvektor_pix.isValid()){
if (ClusterHisto_){
if ( passBPTXfilter_ and passStripDCSfilter_ ){
NumberOfStripClus_vs_BX->Fill(tbx%3564,NStripClusters);
if(passPixelDCSfilter_ ){
NumberOfPixelClus_vs_BX->Fill(tbx%3564,NPixClusters);
if (globalswitchmaindiagonalposition && NStripClusters > 0){
GlobalMainDiagonalPosition_vs_BX->Fill(tbx%3564,atan(NPixClusters/(k0*NStripClusters)));
GlobalTH2MainDiagonalPosition_vs_BX->Fill(tbx%3564,atan(NPixClusters/(k0*NStripClusters)));
}
}

}
}
}

if (isPixValid && !MultiplicityRegion_Vs_APVcycle_filled){
if (globalswitchstripnoise2apvcycle && MultiplicityRegion==2) {StripNoise2Cycle->Fill(tbx_corr%70);}
if (globalswitchstripnoise3apvcycle && MultiplicityRegion==3) {StripNoise3Cycle->Fill(tbx_corr%70);}
Expand All @@ -794,11 +915,12 @@ void SiStripMonitorCluster::analyze(const edm::Event& iEvent, const edm::EventSe
sdetmes.SubDetClusterApvProf->Fill(tbx_corr%70,sdetmes.totNClusters);
if (subdetswitchapvcycleth2on)
sdetmes.SubDetClusterApvTH2->Fill(tbx_corr%70,sdetmes.totNClusters);
if (subdetswitchdbxcycleprofon)
if (subdetswitchdbxcycleprofon) {
sdetmes.SubDetClusterDBxCycleProf->Fill(dbxincycle,sdetmes.totNClusters);
}
if (subdetswitchapvcycledbxprof2on)
sdetmes.SubDetApvDBxProf2->Fill(tbx_corr%70,dbx,sdetmes.totNClusters);
}
}

if ( globalswitchnclusvscycletimeprof2don )
{
Expand Down Expand Up @@ -1144,13 +1266,13 @@ void SiStripMonitorCluster::createSubDetMEs(std::string label , DQMStore::IBooke
edm::ParameterSet Parameters = conf_.getParameter<edm::ParameterSet>("TProfClustersVsDBxCycle");
HistoName = "Cluster_vs_DeltaBxCycle__" + label;
subdetMEs.SubDetClusterDBxCycleProf = ibooker.bookProfile(HistoName,HistoName,
Parameters.getParameter<int32_t>("Nbins"),
Parameters.getParameter<double>("xmin"),
Parameters.getParameter<double>("xmax"),
200, //that parameter should not be there !?
Parameters.getParameter<double>("ymin"),
Parameters.getParameter<double>("ymax"),
"" );
Parameters.getParameter<int32_t>("Nbins"),
Parameters.getParameter<double>("xmin"),
Parameters.getParameter<double>("xmax"),
200, //that parameter should not be there !?
Parameters.getParameter<double>("ymin"),
Parameters.getParameter<double>("ymax"),
"" );
subdetMEs.SubDetClusterDBxCycleProf->setAxisTitle("Delta Bunch Crossing Cycle",1);
}
// DeltaBx vs ApvCycle - 2DProfile
Expand Down
4 changes: 2 additions & 2 deletions DQM/TrackingMonitor/python/TrackerCollisionTrackingMonitor_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
TrackerCollisionTrackMon.TkSizeMin = cms.double(-0.5)

# chi2 dof
TrackerCollisionTrackMon.Chi2NDFBin = cms.int32(50)
TrackerCollisionTrackMon.Chi2NDFMax = cms.double(49.5)
TrackerCollisionTrackMon.Chi2NDFBin = cms.int32(80)
TrackerCollisionTrackMon.Chi2NDFMax = cms.double(79.5)
TrackerCollisionTrackMon.Chi2NDFMin = cms.double(-0.5)

# Number of seeds per Event
Expand Down
4 changes: 2 additions & 2 deletions DQM/TrackingMonitor/python/TrackerHeavyIonTrackingMonitor_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
TrackerHeavyIonTrackMon.TkSizeMin = cms.double(-0.5)

# chi2 dof
TrackerHeavyIonTrackMon.Chi2NDFBin = cms.int32(100)
TrackerHeavyIonTrackMon.Chi2NDFMax = cms.double(49.5)
TrackerHeavyIonTrackMon.Chi2NDFBin = cms.int32(160)
TrackerHeavyIonTrackMon.Chi2NDFMax = cms.double(79.5)
TrackerHeavyIonTrackMon.Chi2NDFMin = cms.double(-0.5)

0 comments on commit 8deb31f

Please sign in to comment.