Skip to content

Commit 912bc18

Browse files
committed
Removing ECAL delete statements to revert to known working version. Added a single character in ECALTPG log output
1 parent 2b68e21 commit 912bc18

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

CondTools/Ecal/src/EcalTPGOddWeightIdMapHandler.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ void popcon::EcalTPGOddWeightIdMapHandler::getNewObjects() {
203203
m_i_oddweightIdMap = weightId;
204204

205205
writeFile("last_tpg_OddweightIdMap_settings.txt");
206-
delete weightMap;
207206

208207
} else {
209208
m_i_run_number = irun;
@@ -274,7 +273,6 @@ void popcon::EcalTPGOddWeightIdMapHandler::readtxtFile() {
274273
throw cms::Exception("FileReadError") << "EcalTPGOddWeightIdMapHandler::readtxtFile error : " << e.what();
275274
}
276275
edm::LogVerbatim("EcalTPGOddWeightIdMapHandler") << " **************** ";
277-
delete weightMap;
278276
}
279277

280278
void popcon::EcalTPGOddWeightIdMapHandler::readxmlFile() {
@@ -332,7 +330,6 @@ void popcon::EcalTPGOddWeightIdMapHandler::readxmlFile() {
332330
throw cms::Exception("FileReadError") << "EcalTPGOddWeightIdMapHandler::readxmlFile error : " << e.what();
333331
}
334332
edm::LogVerbatim("EcalTPGOddWeightIdMapHandler") << " **************** ";
335-
delete weightMap;
336333
}
337334

338335
void popcon::EcalTPGOddWeightIdMapHandler::readFromFile(const char* inputFile) {

CondTools/Ecal/src/EcalTPGTPModeHandler.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ void popcon::EcalTPGTPModeHandler::getNewObjects() {
242242
m_i_TPMode = wId;
243243

244244
writeFile("last_tpg_TPMode_settings.txt");
245-
delete tpMode;
246245

247246
} else {
248247
m_i_run_number = irun;
@@ -324,7 +323,6 @@ void popcon::EcalTPGTPModeHandler::readtxtFile() {
324323
throw cms::Exception("FileReadError") << "EcalTPGTPModeHandler::readtxtFile error : " << e.what();
325324
}
326325
edm::LogVerbatim("EcalTPGTPModeHandler") << " **************** ";
327-
delete tpMode;
328326
}
329327

330328
void popcon::EcalTPGTPModeHandler::readFromFile(const char* inputFile) {

SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixOddAmplitudeFilter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void EcalFenixOddAmplitudeFilter::process(std::vector<int> &addout, std::vector<
4343
edm::LogVerbatim("EcalTPG") << i << " " << stripid_ << " " << weights_[0] << " " << weights_[1] << " "
4444
<< weights_[2] << " " << weights_[3] << " " << weights_[4] << " "
4545
<< weights_[0] / 64.0 << " " << weights_[1] / 64.0 << " " << weights_[2] / 64.0
46-
<< " " << weights_[3] / 64.0 << " " << weights_[4] / 64.0 << "[" << buffer_[0]
46+
<< " " << weights_[3] / 64.0 << " " << weights_[4] / 64.0 << " [" << buffer_[0]
4747
<< ", " << buffer_[1] << ", " << buffer_[2] << ", " << buffer_[3] << ", "
4848
<< buffer_[4] << "]"
4949
<< " --> output: " << processedOutput_ << " ODD";

0 commit comments

Comments
 (0)