Update DT vdrift calibration code to allow using "new" DB format #31808
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,8 @@ | |
|
|
||
| #include "CondFormats/DTObjects/interface/DTMtime.h" | ||
| #include "CondFormats/DataRecord/interface/DTMtimeRcd.h" | ||
| #include "CondFormats/DTObjects/interface/DTRecoConditions.h" | ||
| #include "CondFormats/DataRecord/interface/DTRecoConditionsVdriftRcd.h" | ||
|
|
||
| #include "CalibMuon/DTCalibration/interface/DTCalibDBUtils.h" | ||
| #include "CalibMuon/DTCalibration/interface/DTVDriftPluginFactory.h" | ||
|
|
@@ -32,22 +34,38 @@ using namespace edm; | |
|
|
||
| DTVDriftWriter::DTVDriftWriter(const ParameterSet& pset) | ||
| : granularity_(pset.getUntrackedParameter<string>("calibGranularity", "bySL")), | ||
| mTimeMap_(nullptr), | ||
| vDriftMap_(nullptr), | ||
| vDriftAlgo_{DTVDriftPluginFactory::get()->create(pset.getParameter<string>("vDriftAlgo"), | ||
| pset.getParameter<ParameterSet>("vDriftAlgoConfig"))} { | ||
| LogVerbatim("Calibration") << "[DTVDriftWriter]Constructor called!"; | ||
|
|
||
| if (granularity_ != "bySL") | ||
| throw cms::Exception("Configuration") | ||
| << "[DTVDriftWriter] Check parameter calibGranularity: " << granularity_ << " option not available."; | ||
|
|
||
| readLegacyVDriftDB = pset.getParameter<bool>("readLegacyVDriftDB"); | ||
| writeLegacyVDriftDB = pset.getParameter<bool>("writeLegacyVDriftDB"); | ||
| } | ||
|
|
||
| DTVDriftWriter::~DTVDriftWriter() { LogVerbatim("Calibration") << "[DTVDriftWriter]Destructor called!"; } | ||
|
|
||
| void DTVDriftWriter::beginRun(const edm::Run& run, const edm::EventSetup& setup) { | ||
| // Get the map of vdrift from the Setup | ||
| if (readLegacyVDriftDB) { | ||
| ESHandle<DTMtime> mTime; | ||
| setup.get<DTMtimeRcd>().get(mTime); | ||
|
|
||
| mTimeMap_ = &*mTime; | ||
| } else { | ||
| ESHandle<DTRecoConditions> hVdrift; | ||
| setup.get<DTRecoConditionsVdriftRcd>().get(hVdrift); | ||
|
|
||
| vDriftMap_ = &*hVdrift; | ||
| // Consistency check: no parametrization is implemented for the time being | ||
| int version = vDriftMap_->version(); | ||
| if (version != 1) { | ||
| throw cms::Exception("Configuration") << "only version 1 is presently supported for VDriftDB"; | ||
| } | ||
| } | ||
|
|
||
| // Get geometry from Event Setup | ||
| setup.get<MuonGeometryRecord>().get(dtGeom_); | ||
|
There was a problem hiding this comment. Besides, the same migration would have to be done everywhere in the package; for example. also in |
||
|
|
@@ -57,7 +75,16 @@ void DTVDriftWriter::beginRun(const edm::Run& run, const edm::EventSetup& setup) | |
|
|
||
| void DTVDriftWriter::endJob() { | ||
| // Create the object to be written to DB | ||
| DTMtime* mTimeNewMap = nullptr; | ||
| DTRecoConditions* vDriftNewMap = nullptr; | ||
| if (writeLegacyVDriftDB) { | ||
| mTimeNewMap = new DTMtime(); | ||
| } else { | ||
| vDriftNewMap = new DTRecoConditions(); | ||
| vDriftNewMap->setFormulaExpr("[0]"); | ||
| //vDriftNewMap->setFormulaExpr("[0]*(1-[1]*x)"); // add parametrization for dependency along Y | ||
| vDriftNewMap->setVersion(1); | ||
| } | ||
|
|
||
| if (granularity_ == "bySL") { | ||
| // Get all the sls from the geometry | ||
|
|
@@ -66,34 +93,51 @@ void DTVDriftWriter::endJob() { | |
| auto sl_end = superLayers.end(); | ||
| for (; sl != sl_end; ++sl) { | ||
| DTSuperLayerId slId = (*sl)->id(); | ||
|
|
||
| // Compute vDrift | ||
| float vDriftNew = -1.; | ||
| float resolutionNew = -1; | ||
| try { | ||
| dtCalibration::DTVDriftData vDriftData = vDriftAlgo_->compute(slId); | ||
| vDriftNew = vDriftData.vdrift; | ||
| resolutionNew = vDriftData.resolution; | ||
| LogVerbatim("Calibration") << "vDrift for: " << slId << " Mean " << vDriftNew << " Resolution " | ||
| << resolutionNew; | ||
| } catch (cms::Exception& e) { // Failure to compute new value, fall back to old table | ||
| LogError("Calibration") << e.explainSelf(); | ||
| if (readLegacyVDriftDB) { //...reading old db format... | ||
| int status = mTimeMap_->get(slId, vDriftNew, resolutionNew, DTVelocityUnits::cm_per_ns); | ||
| if (status == 0) { // not found; silently skip this SL | ||
| continue; | ||
| } | ||
| } else { //...reading new db format | ||
| try { | ||
| vDriftNew = vDriftMap_->get(DTWireId(slId.rawId())); | ||
| } catch (cms::Exception& e2) { | ||
| // not found; silently skip this SL | ||
| continue; | ||
| } | ||
| } | ||
| LogVerbatim("Calibration") << "Keep original vDrift for: " << slId << " Mean " << vDriftNew << " Resolution " | ||
| << resolutionNew; | ||
| } | ||
|
|
||
| // Add value to the vdrift table | ||
| if (writeLegacyVDriftDB) { | ||
| mTimeNewMap->set(slId, vDriftNew, resolutionNew, DTVelocityUnits::cm_per_ns); | ||
| } else { | ||
| vector<double> params = {vDriftNew}; | ||
| vDriftNewMap->set(DTWireId(slId.rawId()), params); | ||
| } | ||
| } // End of loop on superlayers | ||
| } | ||
|
|
||
| // Write the vDrift object to DB | ||
| LogVerbatim("Calibration") << "[DTVDriftWriter]Writing vdrift object to DB!"; | ||
| if (writeLegacyVDriftDB) { | ||
| string record = "DTMtimeRcd"; | ||
| DTCalibDBUtils::writeToDB<DTMtime>(record, mTimeNewMap); | ||
| } else { | ||
| DTCalibDBUtils::writeToDB<DTRecoConditions>("DTRecoConditionsVdriftRcd", vDriftNewMap); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please move from
edm::EventSetup::gettoedm::EventSetup::getDatahttps://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideHowToGetDataFromES#Getting_data_from_EventSetup_wit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, but this migration has to be done on these classes anyhow, it is not needed as a consequence of this PR.
Therefore it would make more sense to make it in its own PR, after this one is merged.
I can make a new PR for the migration right away after this one is merged; this is my preference given that this PR is by now tested and fully signed.