Skip to content

Commit

Permalink
Merge pull request #8212 from diguida/autoCond_74X_hijet
Browse files Browse the repository at this point in the history 
Switch to JetCorrectorParametersCollection compatibility DB object with new Global Tags
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 15, 2015
2 parents 385894d + d4fd5a2 commit c193b22
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions Configuration/AlCa/python/autoCond.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : 'MCRUN1_74_V4::All',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : 'MCHI1_74_V4::All',
'run1_mc_hi' : 'MCHI1_74_V5::All',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : 'MCPA1_74_V4::All',
'run1_mc_pa' : 'MCPA1_74_V5::All',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : 'DESRUN2_74_V3::All',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : 'MCRUN2_74_V6::All',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : 'MCRUN2_74_V7::All',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : 'MCHI2_74_V3::All',
'run2_mc_hi' : 'MCHI2_74_V4::All',
# GlobalTag for Run1 data reprocessing
'run1_data' : 'GR_R_74_V8A::All',
'run1_data' : 'GR_R_74_V10A::All',
# GlobalTag for Run2 data reprocessing
'run2_data' : 'GR_R_74_V9A::All',
'run2_data' : 'GR_R_74_V11A::All',
# GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run1_hlt' : 'GR_H_V55A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
# GlobalTag for Run2 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
Expand Down
10 changes: 5 additions & 5 deletions Configuration/AlCa/python/autoCond_condDBv2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : 'MCRUN1_74_V4',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : 'MCHI1_74_V4',
'run1_mc_hi' : 'MCHI1_74_V5',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : 'MCPA1_74_V4',
'run1_mc_pa' : 'MCPA1_74_V5',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : 'DESRUN2_74_V3',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : 'MCRUN2_74_V6',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : 'MCRUN2_74_V7',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : 'MCHI2_74_V3',
'run2_mc_hi' : 'MCHI2_74_V4',
# GlobalTag for Run1 data reprocessing
'run1_data' : 'GR_R_74_V8A',
'run1_data' : 'GR_R_74_V10A',
# GlobalTag for Run2 data reprocessing
'run2_data' : 'GR_R_74_V9A',
'run2_data' : 'GR_R_74_V11A',
# GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run1_hlt' : 'GR_H_V55A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
# GlobalTag for Run2 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiJetAlgos/python/HiRecoJets_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
## background for HF/Voronoi-style subtraction
voronoiBackgroundCalo = cms.EDProducer('VoronoiBackgroundProducer',
src = cms.InputTag('towerMaker'),
tableLabel = cms.string("Calo"),
tableLabel = cms.string("UETable_Calo"),
doEqualize = cms.bool(True),
equalizeThreshold0 = cms.double(5.0),
equalizeThreshold1 = cms.double(35.0),
equalizeR = cms.double(0.4),
useTextTable = cms.bool(True),
jetCorrectorFormat = cms.bool(False),
useTextTable = cms.bool(False),
jetCorrectorFormat = cms.bool(True),
isCalo = cms.bool(True),
etaBins = cms.int32(15),
fourierOrder = cms.int32(5)
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
## background for HF/Voronoi-style subtraction
voronoiBackgroundPF = cms.EDProducer('VoronoiBackgroundProducer',
src = cms.InputTag('particleFlowTmp'),
tableLabel = cms.string("PF"),
tableLabel = cms.string("UETable_PF"),
doEqualize = cms.bool(True),
equalizeThreshold0 = cms.double(5.0),
equalizeThreshold1 = cms.double(35.0),
equalizeR = cms.double(0.3),
# its different than calojets (R=0.4)!
useTextTable = cms.bool(True),
jetCorrectorFormat = cms.bool(False),
useTextTable = cms.bool(False),
jetCorrectorFormat = cms.bool(True),
isCalo = cms.bool(False),
etaBins = cms.int32(15),
fourierOrder = cms.int32(5)
Expand Down

0 comments on commit c193b22

Please sign in to comment.