Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to new format for DT uncertainties #9883

Merged
merged 1 commit into from
Jun 25, 2015
Merged

Switch to new format for DT uncertainties #9883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "FWCore/Utilities/interface/Exception.h"
#include "CondFormats/DTObjects/interface/DTMtime.h"
#include "CondFormats/DataRecord/interface/DTMtimeRcd.h"
#include "CondFormats/DTObjects/interface/DTRecoUncertainties.h"
#include "CondFormats/DataRecord/interface/DTRecoUncertaintiesRcd.h"
#include "CondFormats/DTObjects/interface/DTRecoConditions.h"
#include "CondFormats/DataRecord/interface/DTRecoConditionsUncertRcd.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
Expand All @@ -33,19 +33,9 @@ DTLinearDriftFromDBAlgo::DTLinearDriftFromDBAlgo(const ParameterSet& config) :
doVdriftCorr(config.getParameter<bool>("doVdriftCorr")),
// Option to force going back to digi time at Step 2
stepTwoFromDigi(config.getParameter<bool>("stepTwoFromDigi")),
useUncertDB(false),
useUncertDB(config.getParameter<bool>("useUncertDB")),
// Set verbose output
debug(config.getUntrackedParameter<bool>("debug"))
{
if(debug)
cout<<"[DTLinearDriftFromDBAlgo] Constructor called"<<endl;

// Check for compatibility with older configurations
if (config.existsAs<bool>("useUncertDB")) {
// Assign hit uncertainties based on new uncertainties DB
useUncertDB= config.getParameter<bool>("useUncertDB");
}
}
debug(config.getUntrackedParameter<bool>("debug")){}



Expand All @@ -68,12 +58,10 @@ void DTLinearDriftFromDBAlgo::setES(const EventSetup& setup) {
nominalB = field->nominalValue();

if (useUncertDB) {
ESHandle<DTRecoUncertainties> uncerts;
setup.get<DTRecoUncertaintiesRcd>().get(uncerts);
ESHandle<DTRecoConditions> uncerts;
setup.get<DTRecoConditionsUncertRcd>().get(uncerts);
uncertMap = &*uncerts;

// check uncertainty map type
if (uncertMap->version()>1) edm::LogError("NotImplemented") << "DT Uncertainty DB version unknown: " << uncertMap->version();
if (uncertMap->version()>1) edm::LogError("NotImplemented") << "DT Uncertainty DB version unsupported: " << uncertMap->version();
}

if(debug) {
Expand Down Expand Up @@ -178,7 +166,8 @@ bool DTLinearDriftFromDBAlgo::compute(const DTLayer* layer,

if (useUncertDB) {
// Read the uncertainty from the DB for the given channel and step
hitResolution = uncertMap->get(wireId, step-1);
double args[1] = {double(step-1)};
hitResolution = uncertMap->get(wireId, args);
}

//only in step 3
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "RecoLocalMuon/DTRecHit/interface/DTRecHitBaseAlgo.h"

class DTMtime;
class DTRecoUncertainties;
class DTRecoConditions;
class MagneticField;

class DTLinearDriftFromDBAlgo : public DTRecHitBaseAlgo {
Expand Down Expand Up @@ -89,7 +89,7 @@ class DTLinearDriftFromDBAlgo : public DTRecHitBaseAlgo {
int nominalB;

// Map of hit uncertainties
const DTRecoUncertainties *uncertMap;
const DTRecoConditions *uncertMap;

// Times below MinTime (ns) are considered as coming from previous BXs.
const float minTime;
Expand Down