Skip to content

Commit c56fb8c

Browse files
iarspideriarspider
committed
Changes after review
1 parent 2d0229c commit c56fb8c

File tree

4 files changed

+0
-117
lines changed

4 files changed

+0
-117
lines changed

‎DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -344,34 +344,6 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup &iSetup) {
344344
thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
345345
} else if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
346346
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
347-
/*
348-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
349-
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
350-
if (disk > noOfDisks)
351-
noOfDisks = disk;
352-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
353-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
354-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
355-
char sside[80];
356-
sprintf(sside, "HalfCylinder_%i", side);
357-
char sdisk[80];
358-
sprintf(sdisk, "Disk_%i", disk);
359-
char sblade[80];
360-
sprintf(sblade, "Blade_%02i", blade);
361-
char spanel[80];
362-
sprintf(spanel, "Panel_%i", panel);
363-
char smodule[80];
364-
sprintf(smodule, "Module_%i", module);
365-
std::string side_str = sside;
366-
std::string disk_str = sdisk;
367-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
368-
side_str.find("HalfCylinder_2") != string::npos ||
369-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
370-
// clutch to take all of FPIX, but no BPIX:
371-
mask = false;
372-
if (isPIB && mask)
373-
continue;
374-
*/
375347
SiPixelClusterModule *theModule = new SiPixelClusterModule(id, ncols, nrows);
376348
thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
377349
}

‎DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,70 +1137,11 @@ void SiPixelDigiSource::buildStructure(const edm::EventSetup& iSetup) {
11371137
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
11381138
uint32_t id = detId();
11391139
SiPixelDigiModule* theModule = new SiPixelDigiModule(id, ncols, nrows);
1140-
1141-
/*
1142-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
1143-
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
1144-
if (disk > noOfDisks)
1145-
noOfDisks = disk;
1146-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
1147-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
1148-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
1149-
1150-
char sside[80];
1151-
sprintf(sside, "HalfCylinder_%i", side);
1152-
char sdisk[80];
1153-
sprintf(sdisk, "Disk_%i", disk);
1154-
char sblade[80];
1155-
sprintf(sblade, "Blade_%02i", blade);
1156-
char spanel[80];
1157-
sprintf(spanel, "Panel_%i", panel);
1158-
char smodule[80];
1159-
sprintf(smodule, "Module_%i", module);
1160-
std::string side_str = sside;
1161-
std::string disk_str = sdisk;
1162-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
1163-
side_str.find("HalfCylinder_2") != string::npos ||
1164-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
1165-
// clutch to take all of FPIX, but no BPIX:
1166-
mask = false;
1167-
if (isPIB && mask)
1168-
continue;
1169-
*/
11701140
thePixelStructure.insert(pair<uint32_t, SiPixelDigiModule*>(id, theModule));
11711141
} else if ((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade)) {
11721142
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
11731143
uint32_t id = detId();
11741144
SiPixelDigiModule* theModule = new SiPixelDigiModule(id, ncols, nrows);
1175-
/*
1176-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
1177-
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
1178-
if (disk > noOfDisks)
1179-
noOfDisks = disk;
1180-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
1181-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
1182-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
1183-
1184-
char sside[80];
1185-
sprintf(sside, "HalfCylinder_%i", side);
1186-
char sdisk[80];
1187-
sprintf(sdisk, "Disk_%i", disk);
1188-
char sblade[80];
1189-
sprintf(sblade, "Blade_%02i", blade);
1190-
char spanel[80];
1191-
sprintf(spanel, "Panel_%i", panel);
1192-
char smodule[80];
1193-
sprintf(smodule, "Module_%i", module);
1194-
std::string side_str = sside;
1195-
std::string disk_str = sdisk;
1196-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
1197-
side_str.find("HalfCylinder_2") != string::npos ||
1198-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
1199-
// clutch to take all of FPIX, but no BPIX:
1200-
mask = false;
1201-
if (isPIB && mask)
1202-
continue;
1203-
*/
12041145
thePixelStructure.insert(pair<uint32_t, SiPixelDigiModule*>(id, theModule));
12051146
} //end_elseif(isUpgrade)
12061147
}

‎DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -227,32 +227,6 @@ void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup &iSetup) {
227227
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
228228
uint32_t id = detId();
229229
SiPixelRawDataErrorModule *theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
230-
/*
231-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
232-
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
233-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
234-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
235-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
236-
237-
char sside[80];
238-
sprintf(sside, "HalfCylinder_%i", side);
239-
char sdisk[80];
240-
sprintf(sdisk, "Disk_%i", disk);
241-
char sblade[80];
242-
sprintf(sblade, "Blade_%02i", blade);
243-
char spanel[80];
244-
sprintf(spanel, "Panel_%i", panel);
245-
char smodule[80];
246-
sprintf(smodule, "Module_%i", module);
247-
std::string side_str = sside;
248-
std::string disk_str = sdisk;
249-
bool mask = side_str.find("HalfCylinder_1") != string::npos || side_str.find("HalfCylinder_2") != string::npos ||
250-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
251-
// clutch to take all of FPIX, but no BPIX:
252-
mask = false;
253-
if (isPIB && mask)
254-
continue;
255-
*/
256230
thePixelStructure.insert(pair<uint32_t, SiPixelRawDataErrorModule *>(id, theModule));
257231
}
258232

‎DQMOffline/Muon/src/CSCOfflineMonitor.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,8 @@ void CSCOfflineMonitor::doPedestalNoise(edm::Handle<CSCStripDigiCollection> stri
11101110
(1. / 6) * (myADCVals[2] + myADCVals[3] + myADCVals[4] + myADCVals[5] + myADCVals[6] + myADCVals[7]);
11111111
float threshold = 13.3;
11121112

1113-
// Why is this code block even here? Doesn't use myStrip after setting it (converts channel to strip
1114-
// for ganged ME11A
11151113
if ((kStation == 1 && kRing == 4) && cscGeom->gangedStrips()) {
11161114
kRing = 1;
1117-
// if (myStrip <= 16)
1118-
// myStrip += 64; // no trapping for any bizarreness
11191115
}
11201116

11211117
if (TotalADC > threshold) {

0 commit comments

Comments
 (0)