Skip to content

Commit

Permalink
Merge pull request #9377 from boudoul/DefaultMagField
Browse files Browse the repository at this point in the history 
Loading the Magnetic Field by default from DB
  • Loading branch information
@davidlange6
davidlange6 committed Jun 2, 2015
2 parents 9490c8d + bc62007 commit 37f0450
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Configuration/Applications/python/ConfigBuilder.py
View file
Expand Up @@ -22,7 +22,7 @@ class Options:
defaultOptions.pileup_input = None
defaultOptions.geometry = 'SimDB'
defaultOptions.geometryExtendedOptions = ['ExtendedGFlash','Extended','NoCastor']
defaultOptions.magField = '38T'
defaultOptions.magField = ''
defaultOptions.conditions = None
defaultOptions.useCondDBv1 = False
defaultOptions.scenarioOptions=['pp','cosmics','nocoll','HeavyIons']
Expand Down
24 changes: 1 addition & 23 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Expand Up @@ -130,7 +130,6 @@ def remove(d,key,TELL=False):
'--beamspot' : 'NominalCollision2015',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--magField' : '38T_PostLS1',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1'
}

Expand Down Expand Up @@ -616,7 +615,6 @@ def addForAll(steps,d):
'--fast':'',
'--conditions' :'auto:run2_mc',
'--beamspot' : 'NominalCollision2015',
'--magField' :'38T_PostLS1',
'--customise' :'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
Expand Down Expand Up @@ -819,7 +817,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
#for 2015
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns,RAW2DIGI,L1Reco',
'--conditions' :'auto:run2_mc',
'--magField' :'38T_PostLS1',
'--datatier' :'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--eventcontent':'FEVTDEBUGHLT',
'--customise' :'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1',
Expand Down Expand Up @@ -861,7 +858,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--conditions' : 'auto:run2_mc', # 25ns GT; dedicated dict for 50ns
'--datatier' : 'GEN-SIM-DIGI-RAW',
'--eventcontent': 'PREMIX',
'--magField' : '38T_PostLS1',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1' # temporary replacement for premix; to be brought back to customisePostLS1
}
premixUp2015Defaults50ns = merge([{'--conditions':'auto:run2_mc_50ns'},
Expand All @@ -878,8 +874,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--eventcontent' : 'FEVTDEBUGHLT',
'--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--datamix' : 'PreMix',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1', # temporary replacement for premix; to be brought back to customisePostLS1
'--magField' : '38T_PostLS1',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1' # temporary replacement for premix; to be brought back to customisePostLS1
}
digiPremixUp2015Defaults50ns=merge([{'-s':'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns,RAW2DIGI,L1Reco'},
{'--conditions':'auto:run2_mc_50ns'},
Expand Down Expand Up @@ -984,7 +979,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
#for 2015
step3Up2015Defaults = {'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
'--conditions':'auto:run2_mc',
'--magField' : '38T_PostLS1',
'-n':'10',
'--datatier':'GEN-SIM-RECO,DQMIO',
'--eventcontent':'RECOSIM,DQM',
Expand All @@ -997,7 +991,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):

step3Up2015Hal = {'-s' :'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
'--conditions' :'auto:run2_mc',
'--magField' :'38T_PostLS1',
'--datatier' :'GEN-SIM-RECO,DQMIO',
'--eventcontent':'RECOSIM,DQM',
'-n' :'10',
Expand Down Expand Up @@ -1187,7 +1180,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--scenario':'cosmics'}
steps['HARVESTHAL']={'-s' :'HARVESTING:dqmHarvesting',
'--conditions':'auto:run2_mc',
'--magField' :'38T_PostLS1',
'--mc' :'',
'--filein' :'file:step3_inDQM.root',
'--scenario' :'cosmics',
Expand All @@ -1201,16 +1193,13 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--filetype':'DQM',
'--scenario':'pp'}
steps['HARVESTHI']=merge([hiDefaults,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--magField' : '38T_PostLS1',
'--mc':'',
'--filetype':'DQM'}])
steps['HARVESTHI2011']=merge([hiDefaults2011,{'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--magField' : '38T_PostLS1',
'--mc':'',
'--filetype':'DQM'}])
steps['HARVESTUP15']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting', # todo: remove UP from label
'--conditions':'auto:run2_mc',
'--magField' : '38T_PostLS1',
'--mc':'',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1',
'--filetype':'DQM',
Expand All @@ -1219,15 +1208,13 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):

steps['HARVESTUP15_PU25']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting', # todo: remove UP from label
'--conditions':'auto:run2_mc',
'--magField' : '38T_PostLS1',
'--mc':'',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1',
'--filetype':'DQM',
}

steps['HARVESTUP15_PU50']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting', # todo: remove UP from label
'--conditions':'auto:run2_mc_50ns',
'--magField' : '38T_PostLS1',
'--mc':'',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1',
'--filetype':'DQM',
Expand Down Expand Up @@ -1383,7 +1370,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'-n' : 10,
'--conditions' : gt,
'--beamspot' : 'Gauss',
'--magField' : '38T_PostLS1',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--geometry' : geom
Expand All @@ -1394,7 +1380,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'-n' : 10,
'--conditions' : gt,
'--beamspot' : 'HLLHC',
'--magField' : '38T_PostLS1',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--geometry' : geom
Expand All @@ -1405,7 +1390,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--magField' : '38T_PostLS1',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}
Expand All @@ -1415,7 +1399,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--magField' : '38T_PostLS1',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}
Expand All @@ -1428,7 +1411,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--magField' : '38T_PostLS1',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}
Expand All @@ -1439,7 +1421,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--datatier':'GEN-SIM-RECO',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--magField' : '38T_PostLS1',
'--geometry' : geom
}
if cust!=None : upgradeStepDict['RecoFull'][k]['--customise']=cust
Expand All @@ -1452,7 +1433,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--datatier':'GEN-SIM-RECO',
'-n':'10',
'--eventcontent':'RECOSIM',
'--magField' : '38T_PostLS1',
'--geometry' : geom
}
if cust!=None : upgradeStepDict['RecoFullHGCAL'][k]['--customise']=cust
Expand All @@ -1463,7 +1443,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
upgradeStepDict['HARVESTFull'][k]={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--conditions':gt,
'--mc':'',
'--magField' : '38T_PostLS1',
'--geometry' : geom,
'--scenario' : 'pp',
'--filetype':'DQM'
Expand All @@ -1485,7 +1464,6 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
'--conditions':gt,
'--mc':'',
'--magField' : '38T_PostLS1',
'--geometry' : geom,
'--scenario' : 'pp'
}
Expand Down

0 comments on commit 37f0450

Please sign in to comment.