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