From 49f9bf6a6f83fe50eeebe718d0845831068ca1c2 Mon Sep 17 00:00:00 2001 From: Werner Man-Li Sun Date: Wed, 18 Mar 2009 23:30:53 +0000 Subject: [PATCH] --- yaml --- r: 62315 b: refs/heads/l1tmuon-upgrade-dev c: 29d24564ace38ffd12a4818bfbcb498b22a1291d h: refs/heads/l1tmuon-upgrade-dev i: 62313: 7220abee6cb641bf973860c29d81892bd473cc97 62311: 70fe0c7eea4ea46ea0e31763457696d5aa9347c4 --- [refs] | 2 +- .../L1ExtraFromDigis/src/L1ExtraParticlesProd.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ab2273cd656f9..91ff4c18ed75f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/l1tmuon-upgrade-dev: 5d0d758b417ccee9f5f9f46f58a8c6d853b63728 +refs/heads/l1tmuon-upgrade-dev: 29d24564ace38ffd12a4818bfbcb498b22a1291d diff --git a/trunk/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc b/trunk/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc index 0da8463997324..634b7b6ff273c 100644 --- a/trunk/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc +++ b/trunk/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc @@ -8,7 +8,7 @@ // // Original Author: Werner Sun // Created: Mon Oct 2 22:45:32 EDT 2006 -// $Id: L1ExtraParticlesProd.cc,v 1.20 2008/04/21 14:18:13 wsun Exp $ +// $Id: L1ExtraParticlesProd.cc,v 1.21 2008/04/21 17:36:12 wsun Exp $ // // @@ -32,8 +32,8 @@ #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h" #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h" #include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h" -#include "CondFormats/L1TObjects/interface/L1GctJetEtCalibrationFunction.h" -#include "CondFormats/DataRecord/interface/L1GctJetCalibFunRcd.h" +#include "CondFormats/L1TObjects/interface/L1GctJetFinderParams.h" +#include "CondFormats/DataRecord/interface/L1GctJetFinderParamsRcd.h" #include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h" #include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" @@ -459,11 +459,11 @@ L1ExtraParticlesProd::produce( edm::Event& iEvent, // ~~~~~~~~~~~~~~~~~~~~ Energy Sums ~~~~~~~~~~~~~~~~~~~~ - ESHandle< L1GctJetEtCalibrationFunction > jetCalibFn ; - iSetup.get< L1GctJetCalibFunRcd >().get( jetCalibFn ) ; + ESHandle< L1GctJetFinderParams > jetFinderParams ; + iSetup.get< L1GctJetFinderParamsRcd >().get( jetFinderParams ) ; double etSumLSB = jetScale->linearLsb() ; - double htSumLSB = jetCalibFn->getHtScaleLSB(); + double htSumLSB = jetFinderParams->getHtLsbGeV(); Handle< L1GctEtTotalCollection > hwEtTotColl ; iEvent.getByLabel( etTotSource_, hwEtTotColl ) ;