From 9398857ee959907dab1efc6b5b337e7b6f70f74d Mon Sep 17 00:00:00 2001
From: Nicola Amapane <nicola.amapane@cern.ch>
Date: Wed, 24 Jun 2015 10:32:25 +0200
Subject: [PATCH] Switch to new format for DT uncertainties

---
 .../plugins/DTLinearDriftFromDBAlgo.cc        | 29 ++++++-------------
 .../plugins/DTLinearDriftFromDBAlgo.h         |  4 +--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.cc b/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.cc
index 6eef48c24871b..0832053b00c88 100644
--- a/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.cc
+++ b/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.cc
@@ -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"
@@ -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")){}
 
 
 
@@ -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) {
@@ -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
diff --git a/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h b/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h
index 3f3c793eb7d06..a80a84c983c12 100644
--- a/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h
+++ b/RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h
@@ -12,7 +12,7 @@
 #include "RecoLocalMuon/DTRecHit/interface/DTRecHitBaseAlgo.h"
 
 class DTMtime;
-class DTRecoUncertainties;
+class DTRecoConditions;
 class MagneticField;
 
 class DTLinearDriftFromDBAlgo : public DTRecHitBaseAlgo {
@@ -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;