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.

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

DTDQM reading TwinMux. #13123

Merged
merged 3 commits into from
Feb 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions DQM/DTMonitorClient/python/dtFineDelayCorr_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand All @@ -22,7 +22,7 @@
outputFile = cms.string("dtFineDelaysNew.txt"),
# Tag for the t0Mean Histograms
t0MeanHistoTag = cms.string("TrackCrossingTimeAll"),
# Hardware Source (DDU or DCC)
# Hardware Source (DDU or TM)
hwSource = cms.string("DDU"),
# Choose to use Hist Mean or Gaussian Fit Mean
gaussMean = cms.bool(False),
Expand All @@ -31,7 +31,7 @@

#bxTimeInterval = cms.double(24.95),
#rangeWithinBX = cms.bool(True),
#dbFromDCC = cms.bool(False)
#dbFromTM = cms.bool(False)

)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/python/dtLocalTriggerLutTest_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# enable/disable correlation plot tests
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/python/dtLocalTriggerSynchTest_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand All @@ -18,7 +18,7 @@
nBXLow = cms.int32(1),
minEntries = cms.int32(200),
writeDB = cms.bool(True),
dbFromDCC = cms.bool(False),
dbFromTM = cms.bool(False),
fineParamDiff = cms.bool(False),
coarseParamDiff = cms.bool(False),
numHistoTag = cms.string("TrackCrossingTimeAllInBX"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/python/dtLocalTriggerTest_TP_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU','COM'),
hwSources = cms.untracked.vstring('TM','DDU','COM'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand All @@ -17,7 +17,7 @@
# second fraction test tresholds
secondFracError = cms.untracked.double(0.95),
secondFracWarning = cms.untracked.double(0.8),
# DDU-DCC matching tests tresholds
# DDU-TM matching tests tresholds
matchingFracError = cms.untracked.double(0.65),
matchingFracWarning = cms.untracked.double(0.85),
nEventsCert = cms.untracked.int32(1000)
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(False),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC','DDU'),
hwSources = cms.untracked.vstring('TM','DDU'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/python/dtTriggerLutTest_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run in online environment
runOnline = cms.untracked.bool(True),
# kind of trigger data processed by DTLocalTriggerTask
hwSources = cms.untracked.vstring('DCC'),
hwSources = cms.untracked.vstring('TM'),
# false if DTLocalTriggerTask used LTC digis
localrun = cms.untracked.bool(True),
# root folder for booking of histograms
Expand Down
18 changes: 9 additions & 9 deletions DQM/DTMonitorClient/src/DTLocalTriggerBaseTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ string DTLocalTriggerBaseTest::getMEName(string histoTag, string subfolder, cons
stringstream station; station << chambid.station();
stringstream sector; sector << chambid.sector();

string folderName = topFolder(hwSource=="DCC") + "Wheel" + wheel.str() +
string folderName = topFolder(hwSource=="TM") + "Wheel" + wheel.str() +
"/Sector" + sector.str() + "/Station" + station.str() + "/" ;
if (subfolder!="") { folderName += subfolder + "/"; }

Expand All @@ -145,7 +145,7 @@ string DTLocalTriggerBaseTest::getMEName(string histoTag, string subfolder, int

stringstream wheel; wheel << wh;

string folderName = topFolder(hwSource=="DCC") + "Wheel" + wheel.str() + "/";
string folderName = topFolder(hwSource=="TM") + "Wheel" + wheel.str() + "/";
if (subfolder!="") { folderName += subfolder + "/"; }

string histoname = sourceFolder + folderName
Expand All @@ -161,8 +161,8 @@ void DTLocalTriggerBaseTest::bookSectorHistos(DQMStore::IBooker & ibooker,
stringstream wh; wh << wheel;
stringstream sc; sc << sector;
int sectorid = (wheel+3) + (sector-1)*5;
bool isDCC = hwSource=="DCC" ;
string basedir = topFolder(isDCC)+"Wheel"+wh.str()+"/Sector"+sc.str()+"/";
bool isTM = hwSource=="TM" ;
string basedir = topFolder(isTM)+"Wheel"+wh.str()+"/Sector"+sc.str()+"/";
if (folder!="") {
basedir += folder +"/";
}
Expand Down Expand Up @@ -223,8 +223,8 @@ void DTLocalTriggerBaseTest::bookSectorHistos(DQMStore::IBooker & ibooker,
void DTLocalTriggerBaseTest::bookCmsHistos(DQMStore::IBooker & ibooker,
string hTag, string folder, bool isGlb) {

bool isDCC = hwSource == "DCC";
string basedir = topFolder(isDCC);
bool isTM = hwSource == "TM";
string basedir = topFolder(isTM);
if (folder != "") {
basedir += folder +"/" ;
}
Expand All @@ -245,11 +245,11 @@ void DTLocalTriggerBaseTest::bookWheelHistos(DQMStore::IBooker & ibooker,int whe

stringstream wh; wh << wheel;
string basedir;
bool isDCC = hwSource=="DCC" ;
bool isTM = hwSource=="TM" ;
if (hTag.find("Summary") != string::npos) {
basedir = topFolder(isDCC); //Book summary histo outside wheel directories
basedir = topFolder(isTM); //Book summary histo outside wheel directories
} else {
basedir = topFolder(isDCC) + "Wheel" + wh.str() + "/" ;
basedir = topFolder(isTM) + "Wheel" + wh.str() + "/" ;

}
if (folder != "") {
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTLocalTriggerBaseTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class DTLocalTriggerBaseTest: public DQMEDHarvester{
std::string getMEName(std::string histoTag, std::string subfolder, int wh);

/// Get top folder name
inline std::string & topFolder(bool isDCC) { return isDCC ? baseFolderDCC : baseFolderDDU; } ;
inline std::string & topFolder(bool isTM) { return isTM ? baseFolderTM : baseFolderDDU; } ;

/// Get message logger name
inline std::string category() { return "DTDQM|DTMonitorClient|" + testName + "Test"; } ;
Expand All @@ -112,7 +112,7 @@ class DTLocalTriggerBaseTest: public DQMEDHarvester{
std::string sourceFolder;
edm::ParameterSet parameters;
bool runOnline;
std::string baseFolderDCC;
std::string baseFolderTM;
std::string baseFolderDDU;
std::string trigSource;
std::string hwSource;
Expand Down
10 changes: 5 additions & 5 deletions DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ using namespace std;
DTLocalTriggerEfficiencyTest::DTLocalTriggerEfficiencyTest(const edm::ParameterSet& ps) : trigGeomUtils(0) {

setConfig(ps,"DTLocalTriggerEfficiency");
baseFolderDCC = "DT/03-LocalTrigger-DCC/";
baseFolderTM = "DT/03-LocalTrigger-TM/";
baseFolderDDU = "DT/04-LocalTrigger-DDU/";

bookingdone = 0;
Expand Down Expand Up @@ -192,7 +192,7 @@ void DTLocalTriggerEfficiencyTest::runClientDiagnostic(DQMStore::IBooker & ibook

}

// Perform Efficiency analysis (Theta+Segments) CB FIXME -> no DCC theta qual info
// Perform Efficiency analysis (Theta+Segments) CB FIXME -> no TM theta qual info
TH2F * TrackThetaPosvsAngle = getHisto<TH2F>(igetter.get(getMEName("TrackThetaPosvsAngle","Segment", chId)));
TH2F * TrackThetaPosvsAngleandTrig = getHisto<TH2F>(igetter.get(getMEName("TrackThetaPosvsAngleandTrig","Segment", chId)));
TH2F * TrackThetaPosvsAngleandTrigH = getHisto<TH2F>(igetter.get(getMEName("TrackThetaPosvsAngleandTrigH","Segment", chId)));
Expand Down Expand Up @@ -316,14 +316,14 @@ void DTLocalTriggerEfficiencyTest::bookChambHistos(DQMStore::IBooker & ibooker,D
stringstream sector; sector << chambId.sector();

string fullType = fullName(htype);
bool isDCC = hwSource=="DCC" ;
bool isTM = hwSource=="TM" ;
string HistoName = fullType + "_W" + wheel.str() + "_Sec" + sector.str() + "_St" + station.str();

ibooker.setCurrentFolder(topFolder(isDCC) + "Wheel" + wheel.str() +
ibooker.setCurrentFolder(topFolder(isTM) + "Wheel" + wheel.str() +
"/Sector" + sector.str() +
"/Station" + station.str() + "/Segment");

LogTrace(category()) << "[" << testName << "Test]: booking " + topFolder(isDCC) + "Wheel" << wheel.str()
LogTrace(category()) << "[" << testName << "Test]: booking " + topFolder(isTM) + "Wheel" << wheel.str()
<<"/Sector" << sector.str() << "/Station" << station.str() << "/Segment/" << HistoName;


Expand Down
6 changes: 3 additions & 3 deletions DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace std;
DTLocalTriggerLutTest::DTLocalTriggerLutTest(const edm::ParameterSet& ps){

setConfig(ps,"DTLocalTriggerLut");
baseFolderDCC = "DT/03-LocalTrigger-DCC/";
baseFolderTM = "DT/03-LocalTrigger-TM/";
baseFolderDDU = "DT/04-LocalTrigger-DDU/";
thresholdPhiMean = ps.getUntrackedParameter<double>("thresholdPhiMean",1.5);
thresholdPhiRMS = ps.getUntrackedParameter<double>("thresholdPhiRMS",.5);
Expand Down Expand Up @@ -133,7 +133,7 @@ void DTLocalTriggerLutTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQM


if (doCorrStudy) {
// Perform Correlation Plots analysis (DCC + segment Phi)
// Perform Correlation Plots analysis (TM + segment Phi)

TH2F * TrackPhitkvsPhitrig = getHisto<TH2F>(igetter.get(getMEName("PhitkvsPhitrig","Segment", chId)));

Expand Down Expand Up @@ -169,7 +169,7 @@ void DTLocalTriggerLutTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQM

}

// Perform Correlation Plots analysis (DCC + segment Phib)
// Perform Correlation Plots analysis (TM + segment Phib)
TH2F * TrackPhibtkvsPhibtrig = getHisto<TH2F>(igetter.get(getMEName("PhibtkvsPhibtrig","Segment", chId)));

if (stat != 3 && TrackPhibtkvsPhibtrig && TrackPhibtkvsPhibtrig->GetEntries()>10) {// station 3 has no meaningful MB3 phi bending information
Expand Down
10 changes: 5 additions & 5 deletions DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using namespace std;
DTLocalTriggerSynchTest::DTLocalTriggerSynchTest(const edm::ParameterSet& ps) {

setConfig(ps,"DTLocalTriggerSynch");
baseFolderDCC = "DT/90-LocalTriggerSynch/";
baseFolderTM = "DT/90-LocalTriggerSynch/";
baseFolderDDU = "DT/90-LocalTriggerSynch/";

bookingdone = 0;
Expand Down Expand Up @@ -171,7 +171,7 @@ void DTLocalTriggerSynchTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::I
<< "Test]: writeDB flag set to true. Producing peak position database." << endl;

DTTPGParameters* delayMap = new DTTPGParameters();
hwSource = parameters.getParameter<bool>("dbFromDCC") ? "DCC" : "DDU";
hwSource = parameters.getParameter<bool>("dbFromTM") ? "TM" : "DDU";
std::vector<const DTChamber*>::const_iterator chambIt = muonGeom->chambers().begin();
std::vector<const DTChamber*>::const_iterator chambEnd = muonGeom->chambers().end();
for (; chambIt!=chambEnd; ++chambIt) {
Expand Down Expand Up @@ -237,7 +237,7 @@ float DTLocalTriggerSynchTest::getFloatFromME(DQMStore::IGetter & igetter,
stringstream station; station << chId.station();
stringstream sector; sector << chId.sector();

string folderName = topFolder(hwSource=="DCC") + "Wheel" + wheel.str() +
string folderName = topFolder(hwSource=="TM") + "Wheel" + wheel.str() +
"/Sector" + sector.str() + "/Station" + station.str() + "/" ;

string histoname = sourceFolder + folderName
Expand Down Expand Up @@ -266,10 +266,10 @@ void DTLocalTriggerSynchTest::bookChambHistos(DQMStore::IBooker & ibooker,
stringstream sector; sector << chambId.sector();

string fullType = fullName(htype);
bool isDCC = hwSource=="DCC" ;
bool isTM = hwSource=="TM" ;
string HistoName = fullType + "_W" + wheel.str() + "_Sec" + sector.str() + "_St" + station.str();

string folder = topFolder(isDCC) + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str();
string folder = topFolder(isTM) + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str();
if ( subfolder!="") { folder += "7" + subfolder; }

ibooker.setCurrentFolder(folder);
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace std;
DTLocalTriggerTPTest::DTLocalTriggerTPTest(const edm::ParameterSet& ps){

setConfig(ps,"DTLocalTriggerTP");
baseFolderDCC = "DT/11-LocalTriggerTP-DCC/";
baseFolderTM = "DT/11-LocalTriggerTP-TM/";
baseFolderDDU = "DT/12-LocalTriggerTP-DDU/";

bookingdone = 0;
Expand Down Expand Up @@ -99,7 +99,7 @@ void DTLocalTriggerTPTest::runClientDiagnostic(DQMStore::IBooker & ibooker,
for (int sect=1; sect<=12; ++sect){
DTChamberId chId(wh,stat,sect);

// Perform DCC/DDU common plot analysis (Phi ones)
// Perform TM/DDU common plot analysis (Phi ones)
TH2F * BXvsQual = getHisto<TH2F>(igetter.get(getMEName("BXvsQual","LocalTriggerPhi", chId)));
if ( BXvsQual ) {

Expand Down
30 changes: 15 additions & 15 deletions DQM/DTMonitorClient/src/DTLocalTriggerTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace std;
DTLocalTriggerTest::DTLocalTriggerTest(const edm::ParameterSet& ps){

setConfig(ps,"DTLocalTrigger");
baseFolderDCC = "DT/03-LocalTrigger-DCC/";
baseFolderTM = "DT/03-LocalTrigger-TM/";
baseFolderDDU = "DT/04-LocalTrigger-DDU/";
nMinEvts = ps.getUntrackedParameter<int>("nEventsCert", 5000);

Expand Down Expand Up @@ -118,7 +118,7 @@ void DTLocalTriggerTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter
bookCmsHistos(ibooker,"CorrFractionSummary");
bookCmsHistos(ibooker,"2ndFractionSummary");
}
if (hwSource=="DCC") {
if (hwSource=="TM") {

bookCmsHistos(ibooker,"TrigGlbSummary","",true);
bookCmsHistos(ibooker,"TrigGlbSummary","",true);
Expand Down Expand Up @@ -154,18 +154,18 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto
int sector_id = (wh+3)+(sect-1)*5;

if (hwSource=="COM") {
// Perform DCC-DDU matching test and generates summaries (Phi view)
TH2F * DDUvsDCC = getHisto<TH2F>(igetter.get(getMEName("QualDDUvsQualDCC","LocalTriggerPhi", chId)));
if (DDUvsDCC) {
// Perform TM-DDU matching test and generates summaries (Phi view)
TH2F * DDUvsTM = getHisto<TH2F>(igetter.get(getMEName("QualDDUvsQualTM","LocalTriggerPhi", chId)));
if (DDUvsTM) {

int matchSummary = 1;

if (DDUvsDCC->GetEntries()>1) {
if (DDUvsTM->GetEntries()>1) {

double entries = DDUvsDCC->GetEntries();
double entries = DDUvsTM->GetEntries();
double corrEntries = 0;
for (int ibin=2; ibin<=8; ++ibin) {
corrEntries += DDUvsDCC->GetBinContent(ibin,ibin);
corrEntries += DDUvsTM->GetBinContent(ibin,ibin);
}
double corrRatio = corrEntries/entries;

Expand All @@ -192,7 +192,7 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto
}
}
else {
// Perform DCC/DDU common plot analysis (Phi ones)
// Perform TM/DDU common plot analysis (Phi ones)
TH2F * BXvsQual = getHisto<TH2F>(igetter.get(getMEName("BXvsQual","LocalTriggerPhi", chId)));
TH1F * BestQual = getHisto<TH1F>(igetter.get(getMEName("BestQual","LocalTriggerPhi", chId)));
TH2F * Flag1stvsQual = getHisto<TH2F>(igetter.get(getMEName("Flag1stvsQual","LocalTriggerPhi", chId)));
Expand Down Expand Up @@ -305,8 +305,8 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMSto

}
}
else if (hwSource=="DCC") {
// Perform DCC plot analysis (Theta ones)
else if (hwSource=="TM") {
// Perform TM plot analysis (Theta ones)
TH2F * ThetaPosvsBX = getHisto<TH2F>(igetter.get(getMEName("PositionvsBX","LocalTriggerTheta", chId)));

// no theta triggers in stat 4!
Expand Down Expand Up @@ -395,7 +395,7 @@ void DTLocalTriggerTest::fillGlobalSummary(DQMStore::IGetter & igetter) {

float glbPerc[5] = { 1., 0.9, 0.6, 0.3, 0.01 };
trigSource = "";
hwSource = "DCC";
hwSource = "TM";

int nSecReadout = 0;

Expand All @@ -406,13 +406,13 @@ void DTLocalTriggerTest::fillGlobalSummary(DQMStore::IGetter & igetter) {
int corr = cmsME.find(fullName("CorrFractionSummary"))->second->getBinContent(sect,wh+3);
int second = cmsME.find(fullName("2ndFractionSummary"))->second->getBinContent(sect,wh+3);
int lut=0;
MonitorElement * lutsME = igetter.get(topFolder(hwSource=="DCC") + "Summaries/TrigLutSummary");
MonitorElement * lutsME = igetter.get(topFolder(hwSource=="TM") + "Summaries/TrigLutSummary");
if (lutsME) {
lut = lutsME->getBinContent(sect,wh+3);
maxErr+=4;
} else {
LogTrace(category()) << "[" << testName
<< "Test]: DCC Lut test Summary histo not found." << endl;
<< "Test]: TM Lut test Summary histo not found." << endl;
}
(corr <5 || second<5) && nSecReadout++;
int errcode = ((corr<5 ? corr : 4) + (second<5 ? second : 4) + (lut<5 ? lut : 4) );
Expand All @@ -423,7 +423,7 @@ void DTLocalTriggerTest::fillGlobalSummary(DQMStore::IGetter & igetter) {
}

if (!nSecReadout)
cmsME.find("TrigGlbSummary")->second->Reset(); // white histo id DCC is not RO
cmsME.find("TrigGlbSummary")->second->Reset(); // white histo id TM is not RO

string nEvtsName = "DT/EventInfo/Counters/nProcessedEventsTrigger";
MonitorElement * meProcEvts = igetter.get(nEvtsName);
Expand Down