ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/writeCfg.py
(Generate patch)

Comparing COMP/CRAB/python/writeCfg.py (file contents):
Revision 1.6 by ewv, Wed Apr 30 19:41:29 2008 UTC vs.
Revision 1.7 by ewv, Tue May 6 01:09:58 2008 UTC

# Line 49 | Line 49 | def main(argv) :
49    g4Seed         = 0
50    mixSeed        = 0
51    debug          = False
52 +  _MAXINT        = 900000000
53 +  maxSeeds       = 4         # Kludge, maximum # of seeds that any engine takes
54  
55    try:
56      opts, args = getopt.getopt(argv, "", ["debug", "help"])
# Line 85 | Line 87 | def main(argv) :
87  
88   # Optional Parameters
89  
90 <  maxEvents  = int(os.environ.get('MaxEvents','0'))
90 >  maxEvents  = int(os.environ.get('MaxEvents', '0'))
91    skipEvents = int(os.environ.get('SkipEvents','0'))
92 <  inputFiles = os.environ.get('InputFiles','')
93 <  firstRun   = int(os.environ.get('FirstRun','0'))
94 <  nJob       = int(os.environ.get('NJob','0'))
95 <  preserveSeeds = os.environ.get('PreserveSeeds','')
92 >  firstRun   = int(os.environ.get('FirstRun',  '0'))
93 >  nJob       = int(os.environ.get('NJob',      '0'))
94 >
95 >  inputFiles     = os.environ.get('InputFiles','')
96 >  preserveSeeds  = os.environ.get('PreserveSeeds','')
97    incrementSeeds = os.environ.get('IncrementSeeds','')
98  
99 < # Read Input cfg or python cfg file
99 > # Read Input cfg or python cfg file, FUTURE: Get rid cfg mode
100  
101    if fileName.endswith('py'):
102      handle = open(fileName, 'r')
# Line 142 | Line 145 | def main(argv) :
145      preserveSeedList  = preserveSeeds.split(',')
146  
147    # FUTURE: This function tests the CMSSW version. Can be simplified as we drop support for old versions
148 <  if CMSSW_major < 3: # True for now, should be < 2 when really ready
146 <  # Treatment for seeds, CMSSW < 2_0_x
148 >  if CMSSW_major < 2 or (CMSSW_major == 2 and CMSSW_minor == 0): # Treatment for seeds, CMSSW < 2_1_x
149      if cfg.data.services.has_key('RandomNumberGeneratorService'):
150        ranGenerator = cfg.data.services['RandomNumberGeneratorService']
151        ranModules   = ranGenerator.moduleSeeds
152  
151 –      _MAXINT = 900000000
152 –
153        sourceSeed = int(ranGenerator.sourceSeed.value())
154        if 'sourceSeed' in preserveSeedList:
155          pass
# Line 171 | Line 171 | def main(argv) :
171            if curSeed:
172              curValue = int(curSeed.value())
173              setattr(ranGenerator.moduleSeeds,seed,CfgTypes.untracked(CfgTypes.uint32(_inst.randint(1,_MAXINT))))
174 <  else:
175 <    # Treatment for  seeds, CMSSW => 2_0_x
176 <    #from RandomService import RandomSeedService
174 >  else: # Treatment for  seeds, CMSSW 2_1_x and later
175 >    if cfg.data.services.has_key('RandomNumberGeneratorService'):
176 >      from IOMC.RandomEngine.RandomServiceHelper import RandomNumberServiceHelper
177  
178 +      ranGenerator = cfg.data.services['RandomNumberGeneratorService']
179 +      randSvc = RandomNumberServiceHelper(ranGenerator)
180 +      # sourceSeed is different from the rest, John says will become "theSource"
181 +      if 'sourceSeed' in preserveSeedList:
182 +        pass
183 +      elif 'sourceSeed' in incrementSeedList:
184 +        sourceSeed = int(ranGenerator.sourceSeed.value())
185 +        ranGenerator.sourceSeed = CfgTypes.untracked(CfgTypes.uint32(sourceSeed+nJob))
186 +      else:
187 +        ranGenerator.sourceSeed = CfgTypes.untracked(CfgTypes.uint32(_inst.randint(1,_MAXINT)))
188  
189 <    # This code not currently working because randSvc is not part of the actual configuration file
189 >      # Increment requested seed sets
190 >      for seedName in incrementSeedList:
191 >        curSeeds = randSvc.getNamedSeed(seedName)
192 >        newSeeds = [x+nJob for x in curSeeds]
193 >        randSvc.setNamedSeed(seedName,*newSeeds)
194 >        preserveSeedList.append(seedName)
195  
196 <    # Translate old format to new format first
197 <    randSvc = RandomSeedService()
183 <    try:
184 <      ranGenerator = cfg.data.services['RandomNumberGeneratorService']
185 <      ranModules   = ranGenerator.moduleSeeds
186 <      for seed in ranGenerator.moduleSeeds.parameters().keys():
187 <        curSeed = getattr(ranGenerator.moduleSeeds,seed,None)
188 <        curValue = int(curSeed.value())
189 <        setattr(randSvc,seed,CfgTypes.PSet())
190 <        curPSet = getattr(randSvc,seed,None)
191 <        curPSet.initialSeed = CfgTypes.untracked(CfgTypes.uint32(curValue))
192 <      del ranGenerator.moduleSeeds # Get rid of seeds in old format
193 < # Doesn't work, filter is false      randSvc.populate()
196 >      # Randomize remaining seeds
197 >      randSvc.populate(*preserveSeedList)
198  
199 <    except:
196 <      print "Problems converting old seeds to new format"
199 >  # End version specific code
200  
201 <  # Write out new config file in one format or the other
201 >  # Write out new config file in one format or the other, FUTURE: Get rid of cfg mode
202    outFile = open(outFileName,"w")
203 <  if (outFileName.endswith('py') or outFileName.endswith('pycfg') ):
203 >  if outFileName.endswith('py'):
204      outFile.write("import FWCore.ParameterSet.Config as cms\n")
205      outFile.write(cmsProcess.dumpPython())
206      if (debug):
# Line 215 | Line 218 | def main(argv) :
218   if __name__ == '__main__' :
219      exit_status = main(sys.argv[1:])
220      sys.exit(exit_status)
218 –

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines