Merge pull request #12475 from cms-l1t-offline/pr-hi-gt-fixes-and-rem…

…ove-customs-75x Pr hi gt fixes and remove customs 75x
cms-sw · Nov 19, 2015 · b3785a8 · b3785a8
2 parents 2d3088c + 06da8c1
commit b3785a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -10,23 +10,25 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
     'run1_mc_pa'        :   '75X_mcRun1_pA_v7',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   '75X_mcRun2_design_v10',
+    'run2_design'       :   '75X_mcRun2_design_v11',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
     'run2_mc_50ns'      :   '75X_mcRun2_startup_v9',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   '75X_mcRun2_asymptotic_v10',
+    'run2_mc'           :   '75X_mcRun2_asymptotic_v11',
     # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
-    'run2_mc_hi'        :   '75X_mcRun2_HeavyIon_v7',
+    'run2_mc_hi'        :   '75X_mcRun2_HeavyIon_v9',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '75X_dataRun1_v9',
+    'run1_data'         :   '75X_dataRun1_v10',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '75X_dataRun2_v9',
+    'run2_data'         :   '75X_dataRun2_v10',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '75X_dataRun1_HLT_frozen_v4',
     # GlobalTag for Run2 HLT: it points to the online GT
-    'run2_hlt'          :   '75X_dataRun2_HLT_frozen_v4',
+    'run2_hlt'          :   '75X_dataRun2_HLT_frozen_v6',
+    # GlobalTag for Run2 HLT: it points to the online GT
+    'run2_hlt_hi'       :   '75X_dataRun2_HLTHI_v2',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
-    'phase1_2017_design' :  '75X_upgrade2017_design_v5',
+    'phase1_2017_design' :  '75X_upgrade2017_design_v6',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
     'phase1_2019_design' :  'DES19_70_V2', # placeholder (GT not meant for standard RelVal) 
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2

diff --git a/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2EtSumAlgorithmImpHI.cc b/L1Trigger/L1TCalorimeter/src/firmware/Stage1Layer2EtSumAlgorithmImpHI.cc
@@ -44,7 +44,8 @@ void l1t::Stage1Layer2EtSumAlgorithmImpHI::processEvent(const std::vector<l1t::C
 
   //Region Correction will return uncorrected subregions if
   //regionPUSType is set to None in the config
-  double jetLsb=params_->jetLsb();
+  //double jetLsb=params_->jetLsb();
+  double jetLsb = 0.5; // HI O2O does not set this, and it will never change.
 
   int etSumEtaMinEt = params_->etSumEtaMin(0);
   int etSumEtaMaxEt = params_->etSumEtaMax(0);

diff --git a/L1Trigger/L1TCommon/python/customsPostLS1.py b/L1Trigger/L1TCommon/python/customsPostLS1.py
@@ -149,7 +149,6 @@ def customiseSimL1EmulatorForPostLS1_25ns(process):
 def customiseSimL1EmulatorForPostLS1_Additional_HI(process):
     # set the Stage 1 heavy ions-specific parameters
     # all of these should eventually end up in a GT
-    process.load('L1Trigger.L1TCalorimeter.caloStage1Params_HI_cfi')
     if hasattr(process,'caloConfig'):
         process.caloConfig.fwVersionLayer2 = cms.uint32(1)
     return process