From 8566c2ff7824c28cd0a67d0affbafa5e1df01b66 Mon Sep 17 00:00:00 2001 From: Nicola Amapane Date: Thu, 9 Sep 2021 14:15:31 +0200 Subject: [PATCH] Remove few remaining occuurrences of obsolete DTRecoUncertaintiesRcd/DTRecoUncertainties --- .../test/DBTools/DumpDBToFile.cc | 63 ++++++------------- .../DTCalibration/test/DBTools/DumpDBToFile.h | 2 - .../test/DBTools/DumpFileToDB.cc | 57 ++++++----------- .../DTCalibration/test/DumpDBToFile_cfg.py | 4 +- .../DTCalibration/test/DumpFileToDB_cfg.py | 4 +- .../DTValidation_RelVal_fromRECO_local_cfg.py | 4 +- 6 files changed, 44 insertions(+), 90 deletions(-) diff --git a/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.cc b/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.cc index 11bd0ff22ad49..f146d99d53b18 100644 --- a/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.cc +++ b/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.cc @@ -27,8 +27,6 @@ #include "CondFormats/DTObjects/interface/DTDeadFlag.h" #include "CondFormats/DataRecord/interface/DTReadOutMappingRcd.h" #include "CondFormats/DTObjects/interface/DTReadOutMapping.h" -#include "CondFormats/DataRecord/interface/DTRecoUncertaintiesRcd.h" -#include "CondFormats/DTObjects/interface/DTRecoUncertainties.h" #include "CondFormats/DTObjects/interface/DTRecoConditions.h" #include "CondFormats/DataRecord/interface/DTRecoConditionsTtrigRcd.h" #include "CondFormats/DataRecord/interface/DTRecoConditionsVdriftRcd.h" @@ -98,15 +96,9 @@ void DumpDBToFile::beginRun(const edm::Run&, const EventSetup& setup) { setup.get().get(channels); channelsMap = &*channels; } else if (dbToDump == "RecoUncertDB") { - if (format == "Legacy") { - ESHandle uncerts; - setup.get().get(uncerts); - uncertMap = &*uncerts; - } else if (format == "DTRecoConditions") { - ESHandle h_rconds; - setup.get().get(h_rconds); - rconds = &*h_rconds; - } + ESHandle h_rconds; + setup.get().get(h_rconds); + rconds = &*h_rconds; } } @@ -302,42 +294,23 @@ void DumpDBToFile::endJob() { //---------- Uncertainties } else if (dbToDump == "RecoUncertDB") { - if (format == "Legacy") { - int version = 1; - int type = 2; // par[step] - cout << "RecoUncertDB version: " << uncertMap->version() << endl; - for (DTRecoUncertainties::const_iterator wireAndUncerts = uncertMap->begin(); - wireAndUncerts != uncertMap->end(); - ++wireAndUncerts) { - DTWireId wireId((*wireAndUncerts).first); - vector values = (*wireAndUncerts).second; - // cout << wireId; - // copy(values.begin(), values.end(), ostream_iterator(cout, " cm, ")); - // cout << endl; - int nfields = values.size(); - vector consts = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, float(version * 1000 + type * 100 + nfields)}; - consts.insert(consts.end(), values.begin(), values.end()); - theCalibFile->addCell(wireId, consts); - } - } else if (format == "DTRecoConditions") { - int version = rconds->version(); - string expr = rconds->getFormulaExpr(); - int type = 2; // par[step] - if (version != 1 || expr != "par[step]") - throw cms::Exception("Configuration") << "only version 1, type 2 is presently supported for RecoUncertDB"; + int version = rconds->version(); + string expr = rconds->getFormulaExpr(); + int type = 2; // par[step] + if (version != 1 || expr != "par[step]") + throw cms::Exception("Configuration") << "only version 1, type 2 is presently supported for RecoUncertDB"; - cout << "[DumpDBToFile] DTRecoConditions (uncerts) version: " << rconds->version() << " expression: " << expr - << endl; + cout << "[DumpDBToFile] DTRecoConditions (uncerts) version: " << rconds->version() << " expression: " << expr + << endl; - for (DTRecoConditions::const_iterator irc = rconds->begin(); irc != rconds->end(); ++irc) { - DTWireId wireId(irc->first); - const vector& data = irc->second; - int nfields = data.size(); - vector consts(11 + nfields, -1); - consts[10] = float(version * 1000 + type * 100 + nfields); - std::copy(data.begin(), data.end(), consts.begin() + 11); - theCalibFile->addCell(wireId, consts); - } + for (DTRecoConditions::const_iterator irc = rconds->begin(); irc != rconds->end(); ++irc) { + DTWireId wireId(irc->first); + const vector& data = irc->second; + int nfields = data.size(); + vector consts(11 + nfields, -1); + consts[10] = float(version * 1000 + type * 100 + nfields); + std::copy(data.begin(), data.end(), consts.begin() + 11); + theCalibFile->addCell(wireId, consts); } } //Write constants into file diff --git a/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.h b/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.h index 21ca867d6a64c..8af468bf9d11e 100644 --- a/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.h +++ b/CalibMuon/DTCalibration/test/DBTools/DumpDBToFile.h @@ -21,7 +21,6 @@ class DTStatusFlag; class DTDeadFlag; class DTCalibrationMap; class DTReadOutMapping; -class DTRecoUncertainties; class DTRecoConditions; class DumpDBToFile : public edm::EDAnalyzer { @@ -47,7 +46,6 @@ class DumpDBToFile : public edm::EDAnalyzer { const DTStatusFlag *statusMap; const DTDeadFlag *deadMap; const DTReadOutMapping *channelsMap; - const DTRecoUncertainties *uncertMap; const DTRecoConditions *rconds; DTCalibrationMap *theCalibFile; diff --git a/CalibMuon/DTCalibration/test/DBTools/DumpFileToDB.cc b/CalibMuon/DTCalibration/test/DBTools/DumpFileToDB.cc index 9a031b469f312..f0bf44d53ab32 100644 --- a/CalibMuon/DTCalibration/test/DBTools/DumpFileToDB.cc +++ b/CalibMuon/DTCalibration/test/DBTools/DumpFileToDB.cc @@ -24,7 +24,6 @@ #include "CondFormats/DTObjects/interface/DTStatusFlag.h" #include "CondFormats/DTObjects/interface/DTDeadFlag.h" #include "CondFormats/DTObjects/interface/DTReadOutMapping.h" -#include "CondFormats/DTObjects/interface/DTRecoUncertainties.h" #include "CondFormats/DTObjects/interface/DTRecoConditions.h" #include "CondFormats/DataRecord/interface/DTRecoConditionsTtrigRcd.h" #include "CondFormats/DataRecord/interface/DTRecoConditionsVdriftRcd.h" @@ -268,43 +267,27 @@ void DumpFileToDB::endJob() { //---------- Uncertainties } else if (dbToDump == "RecoUncertDB") { // Write the Uncertainties - if (format == "Legacy") { - DTRecoUncertainties* uncert = new DTRecoUncertainties(); - int version = 1; // Uniform uncertainties per SL and step; parameters 0-3 are for steps 1-4. - uncert->setVersion(version); - // Loop over file entries - for (DTCalibrationMap::const_iterator keyAndCalibs = theCalibFile->keyAndConsts_begin(); - keyAndCalibs != theCalibFile->keyAndConsts_end(); - ++keyAndCalibs) { - vector values = (*keyAndCalibs).second; - vector uncerts(values.begin() + 11, values.end()); - uncert->set((*keyAndCalibs).first, uncerts); - } - DTCalibDBUtils::writeToDB("DTRecoUncertaintiesRcd", uncert); - - } else if (format == "DTRecoConditions") { - DTRecoConditions* conds = new DTRecoConditions(); - conds->setFormulaExpr("par[step]"); - int version = 1; // Uniform uncertainties per SL and step; parameters 0-3 are for steps 1-4. - conds->setVersion(version); - - for (DTCalibrationMap::const_iterator keyAndCalibs = theCalibFile->keyAndConsts_begin(); - keyAndCalibs != theCalibFile->keyAndConsts_end(); - ++keyAndCalibs) { - vector values = (*keyAndCalibs).second; - int fversion = int(values[10] / 1000); - int type = (int(values[10]) % 1000) / 100; - int nfields = int(values[10]) % 100; - if (type != 2) - throw cms::Exception("IncorrectSetup") << "Only type==2 supported for uncertainties DB"; - if (values.size() != unsigned(nfields + 11)) - throw cms::Exception("IncorrectSetup") << "Inconsistent number of fields"; - if (fversion != version) - throw cms::Exception("IncorrectSetup") << "Inconsistent version of file"; + DTRecoConditions* conds = new DTRecoConditions(); + conds->setFormulaExpr("par[step]"); + int version = 1; // Uniform uncertainties per SL and step; parameters 0-3 are for steps 1-4. + conds->setVersion(version); - vector params(values.begin() + 11, values.begin() + 11 + nfields); - conds->set((*keyAndCalibs).first, params); - } + for (DTCalibrationMap::const_iterator keyAndCalibs = theCalibFile->keyAndConsts_begin(); + keyAndCalibs != theCalibFile->keyAndConsts_end(); + ++keyAndCalibs) { + vector values = (*keyAndCalibs).second; + int fversion = int(values[10] / 1000); + int type = (int(values[10]) % 1000) / 100; + int nfields = int(values[10]) % 100; + if (type != 2) + throw cms::Exception("IncorrectSetup") << "Only type==2 supported for uncertainties DB"; + if (values.size() != unsigned(nfields + 11)) + throw cms::Exception("IncorrectSetup") << "Inconsistent number of fields"; + if (fversion != version) + throw cms::Exception("IncorrectSetup") << "Inconsistent version of file"; + + vector params(values.begin() + 11, values.begin() + 11 + nfields); + conds->set((*keyAndCalibs).first, params); DTCalibDBUtils::writeToDB("DTRecoConditionsUncertRcd", conds); } } diff --git a/CalibMuon/DTCalibration/test/DumpDBToFile_cfg.py b/CalibMuon/DTCalibration/test/DumpDBToFile_cfg.py index 609564a561761..beac69b901e1e 100644 --- a/CalibMuon/DTCalibration/test/DumpDBToFile_cfg.py +++ b/CalibMuon/DTCalibration/test/DumpDBToFile_cfg.py @@ -94,8 +94,8 @@ if TYPE=="TTrigDB" : RECORD = "DTTtrigRcd" if TYPE=="VDriftDB" : RECORD = "DTMtimeRcd" if TYPE=="UncertDB" : - RECORD = "DTRecoUncertaintiesRcd" - print('\nWARNING, Legacy RecoUncertDB is deprecated, as it is no longer used in reconstruction code') + RECORD = "" + print('\nERROR, Legacy RecoUncertDB is no longer supported') elif DBFORMAT=="DTRecoConditions" : if TYPE=="TTrigDB" : RECORD = "DTRecoConditionsTtrigRcd" if TYPE=="VDriftDB" : RECORD = "DTRecoConditionsVdriftRcd" diff --git a/CalibMuon/DTCalibration/test/DumpFileToDB_cfg.py b/CalibMuon/DTCalibration/test/DumpFileToDB_cfg.py index 6a77188143f28..c1303f43c207f 100644 --- a/CalibMuon/DTCalibration/test/DumpFileToDB_cfg.py +++ b/CalibMuon/DTCalibration/test/DumpFileToDB_cfg.py @@ -74,8 +74,8 @@ if TYPE=="TTrigDB" : RECORD = "DTTtrigRcd" if TYPE=="VDriftDB" : RECORD = "DTMtimeRcd" if TYPE=="UncertDB" : - RECORD = "DTRecoUncertaintiesRcd" - print('\nWARNING, Legacy RecoUncertDB is deprecated, as it is no longer used in reconstruction code') + RECORD = "" + print('\nERROR, Legacy RecoUncertDB is no longer supported') elif DBFORMAT=="DTRecoConditions" : if TYPE=="TTrigDB" : RECORD = "DTRecoConditionsTtrigRcd" if TYPE=="VDriftDB" : RECORD = "DTRecoConditionsVdriftRcd" diff --git a/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_local_cfg.py b/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_local_cfg.py index 6cb49f814b5d4..90de830ec9384 100644 --- a/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_local_cfg.py +++ b/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_local_cfg.py @@ -36,8 +36,8 @@ ## Uncertainty DB if uncertDB != "" : process.GlobalTag.toGet = cms.VPSet( - cms.PSet(record = cms.string("DTRecoUncertaintiesRcd"), - tag = cms.string("DTRecoUncertainties_test"), + cms.PSet(record = cms.string("DTRecoConditionsUncertRcd"), + tag = cms.string("UncertDB"), connect = cms.untracked.string("sqlite_file:"+uncertDB)) )