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

Comparing COMP/CRAB/python/cms_cmssw.py (file contents):
Revision 1.107 by gutsche, Tue Jul 24 19:49:35 2007 UTC vs.
Revision 1.157 by spiga, Sun Feb 17 20:13:00 2008 UTC

# Line 2 | Line 2 | from JobType import JobType
2   from crab_logger import Logger
3   from crab_exceptions import *
4   from crab_util import *
5 + from BlackWhiteListParser import BlackWhiteListParser
6   import common
7   import Scram
8  
# Line 12 | Line 13 | class Cmssw(JobType):
13          JobType.__init__(self, 'CMSSW')
14          common.logger.debug(3,'CMSSW::__init__')
15  
16 +        self.argsList = []
17 +
18          self._params = {}
19          self.cfg_params = cfg_params
20 +        # init BlackWhiteListParser
21 +        self.blackWhiteListParser = BlackWhiteListParser(cfg_params)
22  
23 <        try:
19 <            self.MaxTarBallSize = float(self.cfg_params['EDG.maxtarballsize'])
20 <        except KeyError:
21 <            self.MaxTarBallSize = 9.5
23 >        self.MaxTarBallSize = float(self.cfg_params.get('EDG.maxtarballsize',9.5))
24  
25          # number of jobs requested to be created, limit obj splitting
26          self.ncjobs = ncjobs
27  
28          log = common.logger
29 <        
29 >
30          self.scram = Scram.Scram(cfg_params)
31          self.additional_inbox_files = []
32          self.scriptExe = ''
# Line 33 | Line 35 | class Cmssw(JobType):
35          self.tgz_name = 'default.tgz'
36          self.additional_tgz_name = 'additional.tgz'
37          self.scriptName = 'CMSSW.sh'
38 <        self.pset = ''      #scrip use case Da  
38 >        self.pset = ''      #scrip use case Da
39          self.datasetPath = '' #scrip use case Da
40  
41          # set FJR file name
42          self.fjrFileName = 'crab_fjr.xml'
43  
44          self.version = self.scram.getSWVersion()
45 +
46 +        #
47 +        # Try to block creation in case of arch/version mismatch
48 +        #
49 +
50 +        a = string.split(self.version, "_")
51 +
52 +        if int(a[1]) == 1 and (int(a[2]) < 5 and self.executable_arch.find('slc4') == 0):
53 +            msg = "Warning: You are using %s version of CMSSW  with %s architecture. \n--> Did you compile your libraries with SLC3? Otherwise you can find some problems running on SLC4 Grid nodes.\n"%(self.version, self.executable_arch)
54 +            common.logger.message(msg)
55 +        if int(a[1]) == 1 and (int(a[2]) >= 5 and self.executable_arch.find('slc3') == 0):
56 +            msg = "Error: CMS does not support %s with %s architecture"%(self.version, self.executable_arch)
57 +            raise CrabException(msg)
58 +
59          common.taskDB.setDict('codeVersion',self.version)
60          self.setParam_('application', self.version)
61  
62          ### collect Data cards
63  
64 <        ## get DBS mode
65 <        try:
50 <            self.use_dbs_1 = int(self.cfg_params['CMSSW.use_dbs_1'])
51 <        except KeyError:
52 <            self.use_dbs_1 = 0
53 <            
54 <        try:
55 <            tmp =  cfg_params['CMSSW.datasetpath']
56 <            log.debug(6, "CMSSW::CMSSW(): datasetPath = "+tmp)
57 <            if string.lower(tmp)=='none':
58 <                self.datasetPath = None
59 <                self.selectNoInput = 1
60 <            else:
61 <                self.datasetPath = tmp
62 <                self.selectNoInput = 0
63 <        except KeyError:
64 <            msg = "Error: datasetpath not defined "  
64 >        if not cfg_params.has_key('CMSSW.datasetpath'):
65 >            msg = "Error: datasetpath not defined "
66              raise CrabException(msg)
67 +        tmp =  cfg_params['CMSSW.datasetpath']
68 +        log.debug(6, "CMSSW::CMSSW(): datasetPath = "+tmp)
69 +        if string.lower(tmp)=='none':
70 +            self.datasetPath = None
71 +            self.selectNoInput = 1
72 +        else:
73 +            self.datasetPath = tmp
74 +            self.selectNoInput = 0
75  
76          # ML monitoring
77          # split dataset path style: /PreProdR3Minbias/SIM/GEN-SIM
# Line 70 | Line 79 | class Cmssw(JobType):
79              self.setParam_('dataset', 'None')
80              self.setParam_('owner', 'None')
81          else:
82 +            ## SL what is supposed to fail here?
83              try:
84                  datasetpath_split = self.datasetPath.split("/")
85                  # standard style
86 <                if self.use_dbs_1 == 1 :
87 <                    self.setParam_('dataset', datasetpath_split[1])
88 <                    self.setParam_('owner', datasetpath_split[-1])
79 <                else:
80 <                    self.setParam_('dataset', datasetpath_split[1])
81 <                    self.setParam_('owner', datasetpath_split[2])
86 >                self.setParam_('datasetFull', self.datasetPath)
87 >                self.setParam_('dataset', datasetpath_split[1])
88 >                self.setParam_('owner', datasetpath_split[2])
89              except:
90                  self.setParam_('dataset', self.datasetPath)
91                  self.setParam_('owner', self.datasetPath)
92 <                
93 <        self.setTaskid_()
87 <        self.setParam_('taskId', self.cfg_params['taskId'])
92 >
93 >        self.setParam_('taskId', common.taskDB.dict('taskId'))
94  
95          self.dataTiers = []
96  
97          ## now the application
98 <        try:
99 <            self.executable = cfg_params['CMSSW.executable']
100 <            self.setParam_('exe', self.executable)
95 <            log.debug(6, "CMSSW::CMSSW(): executable = "+self.executable)
96 <            msg = "Default executable cmsRun overridden. Switch to " + self.executable
97 <            log.debug(3,msg)
98 <        except KeyError:
99 <            self.executable = 'cmsRun'
100 <            self.setParam_('exe', self.executable)
101 <            msg = "User executable not defined. Use cmsRun"
102 <            log.debug(3,msg)
103 <            pass
98 >        self.executable = cfg_params.get('CMSSW.executable','cmsRun')
99 >        self.setParam_('exe', self.executable)
100 >        log.debug(6, "CMSSW::CMSSW(): executable = "+self.executable)
101  
102 <        try:
106 <            self.pset = cfg_params['CMSSW.pset']
107 <            log.debug(6, "Cmssw::Cmssw(): PSet file = "+self.pset)
108 <            if self.pset.lower() != 'none' :
109 <                if (not os.path.exists(self.pset)):
110 <                    raise CrabException("User defined PSet file "+self.pset+" does not exist")
111 <            else:
112 <                self.pset = None
113 <        except KeyError:
102 >        if not cfg_params.has_key('CMSSW.pset'):
103              raise CrabException("PSet file missing. Cannot run cmsRun ")
104 +        self.pset = cfg_params['CMSSW.pset']
105 +        log.debug(6, "Cmssw::Cmssw(): PSet file = "+self.pset)
106 +        if self.pset.lower() != 'none' :
107 +            if (not os.path.exists(self.pset)):
108 +                raise CrabException("User defined PSet file "+self.pset+" does not exist")
109 +        else:
110 +            self.pset = None
111  
112          # output files
113          ## stuff which must be returned always via sandbox
# Line 121 | Line 117 | class Cmssw(JobType):
117          self.output_file_sandbox.append(self.fjrFileName)
118  
119          # other output files to be returned via sandbox or copied to SE
120 <        try:
121 <            self.output_file = []
122 <            tmp = cfg_params['CMSSW.output_file']
123 <            if tmp != '':
124 <                tmpOutFiles = string.split(cfg_params['CMSSW.output_file'],',')
125 <                log.debug(7, 'cmssw::cmssw(): output files '+str(tmpOutFiles))
126 <                for tmp in tmpOutFiles:
127 <                    tmp=string.strip(tmp)
132 <                    self.output_file.append(tmp)
133 <                    pass
134 <            else:
135 <                log.message("No output file defined: only stdout/err and the CRAB Framework Job Report will be available\n")
120 >        self.output_file = []
121 >        tmp = cfg_params.get('CMSSW.output_file',None)
122 >        if tmp :
123 >            tmpOutFiles = string.split(tmp,',')
124 >            log.debug(7, 'cmssw::cmssw(): output files '+str(tmpOutFiles))
125 >            for tmp in tmpOutFiles:
126 >                tmp=string.strip(tmp)
127 >                self.output_file.append(tmp)
128                  pass
129 <            pass
138 <        except KeyError:
129 >        else:
130              log.message("No output file defined: only stdout/err and the CRAB Framework Job Report will be available\n")
131 <            pass
131 >        pass
132  
133          # script_exe file as additional file in inputSandbox
134 <        try:
135 <            self.scriptExe = cfg_params['USER.script_exe']
136 <            if self.scriptExe != '':
137 <               if not os.path.isfile(self.scriptExe):
138 <                  msg ="ERROR. file "+self.scriptExe+" not found"
139 <                  raise CrabException(msg)
149 <               self.additional_inbox_files.append(string.strip(self.scriptExe))
150 <        except KeyError:
151 <            self.scriptExe = ''
134 >        self.scriptExe = cfg_params.get('USER.script_exe',None)
135 >        if self.scriptExe :
136 >           if not os.path.isfile(self.scriptExe):
137 >              msg ="ERROR. file "+self.scriptExe+" not found"
138 >              raise CrabException(msg)
139 >           self.additional_inbox_files.append(string.strip(self.scriptExe))
140  
141          #CarlosDaniele
142          if self.datasetPath == None and self.pset == None and self.scriptExe == '' :
# Line 156 | Line 144 | class Cmssw(JobType):
144             raise CrabException(msg)
145  
146          ## additional input files
147 <        try:
147 >        if cfg_params.has_key('USER.additional_input_files'):
148              tmpAddFiles = string.split(cfg_params['USER.additional_input_files'],',')
149              for tmp in tmpAddFiles:
150                  tmp = string.strip(tmp)
# Line 180 | Line 168 | class Cmssw(JobType):
168                  pass
169              pass
170              common.logger.debug(5,"Additional input files: "+str(self.additional_inbox_files))
171 <        except KeyError:
184 <            pass
185 <
186 <        # files per job
187 <        try:
188 <            if (cfg_params['CMSSW.files_per_jobs']):
189 <                raise CrabException("files_per_jobs no longer supported.  Quitting.")
190 <        except KeyError:
191 <            pass
171 >        pass
172  
173          ## Events per job
174 <        try:
174 >        if cfg_params.has_key('CMSSW.events_per_job'):
175              self.eventsPerJob =int( cfg_params['CMSSW.events_per_job'])
176              self.selectEventsPerJob = 1
177 <        except KeyError:
177 >        else:
178              self.eventsPerJob = -1
179              self.selectEventsPerJob = 0
180 <    
180 >
181          ## number of jobs
182 <        try:
182 >        if cfg_params.has_key('CMSSW.number_of_jobs'):
183              self.theNumberOfJobs =int( cfg_params['CMSSW.number_of_jobs'])
184              self.selectNumberOfJobs = 1
185 <        except KeyError:
185 >        else:
186              self.theNumberOfJobs = 0
187              self.selectNumberOfJobs = 0
188  
189 <        try:
189 >        if cfg_params.has_key('CMSSW.total_number_of_events'):
190              self.total_number_of_events = int(cfg_params['CMSSW.total_number_of_events'])
191              self.selectTotalNumberEvents = 1
192 <        except KeyError:
192 >        else:
193              self.total_number_of_events = 0
194              self.selectTotalNumberEvents = 0
195  
196 <        if self.pset != None: #CarlosDaniele
196 >        if self.pset != None: #CarlosDaniele
197               if ( (self.selectTotalNumberEvents + self.selectEventsPerJob + self.selectNumberOfJobs) != 2 ):
198                   msg = 'Must define exactly two of total_number_of_events, events_per_job, or number_of_jobs.'
199                   raise CrabException(msg)
# Line 223 | Line 203 | class Cmssw(JobType):
203                   raise CrabException(msg)
204  
205          ## source seed for pythia
206 <        try:
227 <            self.sourceSeed = int(cfg_params['CMSSW.pythia_seed'])
228 <        except KeyError:
229 <            self.sourceSeed = None
230 <            common.logger.debug(5,"No seed given")
206 >        self.sourceSeed = cfg_params.get('CMSSW.pythia_seed',None)
207  
208 <        try:
233 <            self.sourceSeedVtx = int(cfg_params['CMSSW.vtx_seed'])
234 <        except KeyError:
235 <            self.sourceSeedVtx = None
236 <            common.logger.debug(5,"No vertex seed given")
208 >        self.sourceSeedVtx = cfg_params.get('CMSSW.vtx_seed',None)
209  
210 <        try:
239 <            self.sourceSeedG4 = int(cfg_params['CMSSW.g4_seed'])
240 <        except KeyError:
241 <            self.sourceSeedG4 = None
242 <            common.logger.debug(5,"No g4 sim hits seed given")
210 >        self.sourceSeedG4 = cfg_params.get('CMSSW.g4_seed',None)
211  
212 <        try:
213 <            self.sourceSeedMix = int(cfg_params['CMSSW.mix_seed'])
214 <        except KeyError:
247 <            self.sourceSeedMix = None
248 <            common.logger.debug(5,"No mix seed given")
212 >        self.sourceSeedMix = cfg_params.get('CMSSW.mix_seed',None)
213 >
214 >        self.firstRun = cfg_params.get('CMSSW.first_run',None)
215  
250 –        try:
251 –            self.firstRun = int(cfg_params['CMSSW.first_run'])
252 –        except KeyError:
253 –            self.firstRun = None
254 –            common.logger.debug(5,"No first run given")
216          if self.pset != None: #CarlosDaniele
217 <            ver = string.split(self.version,"_")
257 <            if (int(ver[1])>=1 and int(ver[2])>=5):
258 <                import PsetManipulator150 as pp
259 <            else:
260 <                import PsetManipulator as pp
217 >            import PsetManipulator as pp
218              PsetEdit = pp.PsetManipulator(self.pset) #Daniele Pset
219  
220 +        # Copy/return
221 +
222 +        self.copy_data = int(cfg_params.get('USER.copy_data',0))
223 +        self.return_data = int(cfg_params.get('USER.return_data',0))
224 +
225          #DBSDLS-start
226 <        ## Initialize the variables that are extracted from DBS/DLS and needed in other places of the code
226 >        ## Initialize the variables that are extracted from DBS/DLS and needed in other places of the code
227          self.maxEvents=0  # max events available   ( --> check the requested nb. of evts in Creator.py)
228          self.DBSPaths={}  # all dbs paths requested ( --> input to the site local discovery script)
229          self.jobDestination=[]  # Site destination(s) for each job (list of lists)
# Line 270 | Line 232 | class Cmssw(JobType):
232          blockSites = {}
233          if self.datasetPath:
234              blockSites = self.DataDiscoveryAndLocation(cfg_params)
235 <        #DBSDLS-end          
235 >        #DBSDLS-end
236  
237          self.tgzNameWithPath = self.getTarBall(self.executable)
238 <    
238 >
239          ## Select Splitting
240 <        if self.selectNoInput:
240 >        if self.selectNoInput:
241              if self.pset == None: #CarlosDaniele
242                  self.jobSplittingForScript()
243              else:
# Line 288 | Line 250 | class Cmssw(JobType):
250              try:
251                  if (self.datasetPath): # standard job
252                      # allow to processa a fraction of events in a file
253 <                    PsetEdit.inputModule("INPUT")
254 <                    PsetEdit.maxEvent("INPUTMAXEVENTS")
255 <                    PsetEdit.skipEvent("INPUTSKIPEVENTS")
253 >                    PsetEdit.inputModule("INPUTFILE")
254 >                    PsetEdit.maxEvent(0)
255 >                    PsetEdit.skipEvent(0)
256                  else:  # pythia like job
257                      PsetEdit.maxEvent(self.eventsPerJob)
258                      if (self.firstRun):
259 <                        PsetEdit.pythiaFirstRun("INPUTFIRSTRUN")  #First Run
259 >                        PsetEdit.pythiaFirstRun(0)  #First Run
260                      if (self.sourceSeed) :
261 <                        PsetEdit.pythiaSeed("INPUT")
261 >                        PsetEdit.pythiaSeed(0)
262                          if (self.sourceSeedVtx) :
263 <                            PsetEdit.vtxSeed("INPUTVTX")
263 >                            PsetEdit.vtxSeed(0)
264                          if (self.sourceSeedG4) :
265 <                            self.PsetEdit.g4Seed("INPUTG4")
265 >                            PsetEdit.g4Seed(0)
266                          if (self.sourceSeedMix) :
267 <                            self.PsetEdit.mixSeed("INPUTMIX")
267 >                            PsetEdit.mixSeed(0)
268                  # add FrameworkJobReport to parameter-set
269                  PsetEdit.addCrabFJR(self.fjrFileName)
270                  PsetEdit.psetWriter(self.configFilename())
# Line 313 | Line 275 | class Cmssw(JobType):
275      def DataDiscoveryAndLocation(self, cfg_params):
276  
277          import DataDiscovery
316 –        import DataDiscovery_DBS2
278          import DataLocation
279          common.logger.debug(10,"CMSSW::DataDiscoveryAndLocation()")
280  
# Line 322 | Line 283 | class Cmssw(JobType):
283          ## Contact the DBS
284          common.logger.message("Contacting Data Discovery Services ...")
285          try:
286 <
326 <            if self.use_dbs_1 == 1 :
327 <                self.pubdata=DataDiscovery.DataDiscovery(datasetPath, cfg_params)
328 <            else :
329 <                self.pubdata=DataDiscovery_DBS2.DataDiscovery_DBS2(datasetPath, cfg_params)
286 >            self.pubdata=DataDiscovery.DataDiscovery(datasetPath, cfg_params)
287              self.pubdata.fetchDBSInfo()
288  
289          except DataDiscovery.NotExistingDatasetError, ex :
# Line 338 | Line 295 | class Cmssw(JobType):
295          except DataDiscovery.DataDiscoveryError, ex:
296              msg = 'ERROR ***: failed Data Discovery in DBS :  %s'%ex.getErrorMessage()
297              raise CrabException(msg)
341 –        except DataDiscovery_DBS2.NotExistingDatasetError_DBS2, ex :
342 –            msg = 'ERROR ***: failed Data Discovery in DBS : %s'%ex.getErrorMessage()
343 –            raise CrabException(msg)
344 –        except DataDiscovery_DBS2.NoDataTierinProvenanceError_DBS2, ex :
345 –            msg = 'ERROR ***: failed Data Discovery in DBS : %s'%ex.getErrorMessage()
346 –            raise CrabException(msg)
347 –        except DataDiscovery_DBS2.DataDiscoveryError_DBS2, ex:
348 –            msg = 'ERROR ***: failed Data Discovery in DBS :  %s'%ex.getErrorMessage()
349 –            raise CrabException(msg)
298  
299          self.filesbyblock=self.pubdata.getFiles()
300          self.eventsbyblock=self.pubdata.getEventsPerBlock()
301          self.eventsbyfile=self.pubdata.getEventsPerFile()
302  
303          ## get max number of events
304 <        self.maxEvents=self.pubdata.getMaxEvents() ##  self.maxEvents used in Creator.py
304 >        self.maxEvents=self.pubdata.getMaxEvents() ##  self.maxEvents used in Creator.py
305  
306          ## Contact the DLS and build a list of sites hosting the fileblocks
307          try:
# Line 362 | Line 310 | class Cmssw(JobType):
310          except DataLocation.DataLocationError , ex:
311              msg = 'ERROR ***: failed Data Location in DLS \n %s '%ex.getErrorMessage()
312              raise CrabException(msg)
313 <        
313 >
314  
315          sites = dataloc.getSites()
316          allSites = []
# Line 376 | Line 324 | class Cmssw(JobType):
324          common.logger.message("Requested dataset: " + datasetPath + " has " + str(self.maxEvents) + " events in " + str(len(self.filesbyblock.keys())) + " blocks.\n")
325  
326          return sites
327 <    
327 >
328 >    def setArgsList(self, argsList):
329 >        self.argsList = argsList
330 >
331      def jobSplittingByBlocks(self, blockSites):
332          """
333          Perform job splitting. Jobs run over an integer number of files
# Line 426 | Line 377 | class Cmssw(JobType):
377              totalNumberOfJobs = 999999999
378          else :
379              totalNumberOfJobs = self.ncjobs
380 <            
380 >
381  
382          blocks = blockSites.keys()
383          blockCount = 0
# Line 446 | Line 397 | class Cmssw(JobType):
397              blockCount += 1
398              if block not in jobsOfBlock.keys() :
399                  jobsOfBlock[block] = []
400 <            
400 >
401              if self.eventsbyblock.has_key(block) :
402                  numEventsInBlock = self.eventsbyblock[block]
403                  common.logger.debug(5,'Events in Block File '+str(numEventsInBlock))
404 <            
404 >
405                  files = self.filesbyblock[block]
406                  numFilesInBlock = len(files)
407                  if (numFilesInBlock <= 0):
# Line 458 | Line 409 | class Cmssw(JobType):
409                  fileCount = 0
410  
411                  # ---- New block => New job ---- #
412 <                parString = "\\{"
412 >                parString = ""
413                  # counter for number of events in files currently worked on
414                  filesEventCount = 0
415                  # flag if next while loop should touch new file
416                  newFile = 1
417                  # job event counter
418                  jobSkipEventCount = 0
419 <            
419 >
420                  # ---- Iterate over the files in the block until we've met the requested ---- #
421                  # ---- total # of events or we've gone over all the files in this block  ---- #
422                  while ( (eventsRemaining > 0) and (fileCount < numFilesInBlock) and (jobCount < totalNumberOfJobs) ):
# Line 481 | Line 432 | class Cmssw(JobType):
432                              newFile = 0
433                          except KeyError:
434                              common.logger.message("File "+str(file)+" has unknown number of events: skipping")
435 <                        
435 >
436  
437                      # if less events in file remain than eventsPerJobRequested
438                      if ( filesEventCount - jobSkipEventCount < eventsPerJobRequested ) :
# Line 490 | Line 441 | class Cmssw(JobType):
441                              # end job using last file, use remaining events in block
442                              # close job and touch new file
443                              fullString = parString[:-2]
493 –                            fullString += '\\}'
444                              list_of_lists.append([fullString,str(-1),str(jobSkipEventCount)])
445                              common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(filesEventCount - jobSkipEventCount)+" events (last file in block).")
446                              self.jobDestination.append(blockSites[block])
# Line 503 | Line 453 | class Cmssw(JobType):
453                              eventsRemaining = eventsRemaining - filesEventCount + jobSkipEventCount
454                              jobSkipEventCount = 0
455                              # reset file
456 <                            parString = "\\{"
456 >                            parString = ""
457                              filesEventCount = 0
458                              newFile = 1
459                              fileCount += 1
# Line 515 | Line 465 | class Cmssw(JobType):
465                      elif ( filesEventCount - jobSkipEventCount == eventsPerJobRequested ) :
466                          # close job and touch new file
467                          fullString = parString[:-2]
518 –                        fullString += '\\}'
468                          list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)])
469                          common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(eventsPerJobRequested)+" events.")
470                          self.jobDestination.append(blockSites[block])
# Line 527 | Line 476 | class Cmssw(JobType):
476                          eventsRemaining = eventsRemaining - eventsPerJobRequested
477                          jobSkipEventCount = 0
478                          # reset file
479 <                        parString = "\\{"
479 >                        parString = ""
480                          filesEventCount = 0
481                          newFile = 1
482                          fileCount += 1
483 <                        
483 >
484                      # if more events in file remain than eventsPerJobRequested
485                      else :
486                          # close job but don't touch new file
487                          fullString = parString[:-2]
539 –                        fullString += '\\}'
488                          list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)])
489                          common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(eventsPerJobRequested)+" events.")
490                          self.jobDestination.append(blockSites[block])
# Line 551 | Line 499 | class Cmssw(JobType):
499                          jobSkipEventCount = eventsPerJobRequested - (filesEventCount - jobSkipEventCount - self.eventsbyfile[file])
500                          # remove all but the last file
501                          filesEventCount = self.eventsbyfile[file]
502 <                        parString = "\\{"
502 >                        parString = ""
503                          parString += '\\\"' + file + '\\\"\,'
504                      pass # END if
505                  pass # END while (iterate over files in the block)
# Line 560 | Line 508 | class Cmssw(JobType):
508          if (eventsRemaining > 0 and jobCount < totalNumberOfJobs ):
509              common.logger.message("Could not run on all requested events because some blocks not hosted at allowed sites.")
510          common.logger.message(str(jobCount)+" job(s) can run on "+str(totalEventCount)+" events.\n")
511 <        
511 >
512          # screen output
513          screenOutput = "List of jobs and available destination sites:\n\n"
514  
515 +        # keep trace of block with no sites to print a warning at the end
516 +        noSiteBlock = []
517 +        bloskNoSite = []
518 +
519          blockCounter = 0
520          for block in blocks:
521              if block in jobsOfBlock.keys() :
522                  blockCounter += 1
523 <                screenOutput += "Block %5i: jobs %20s: sites: %s\n" % (blockCounter,spanRanges(jobsOfBlock[block]),','.join(blockSites[block]))
523 >                screenOutput += "Block %5i: jobs %20s: sites: %s\n" % (blockCounter,spanRanges(jobsOfBlock[block]),','.join(self.blackWhiteListParser.checkWhiteList(self.blackWhiteListParser.checkBlackList(blockSites[block],block),block)))
524 >                if len(self.blackWhiteListParser.checkWhiteList(self.blackWhiteListParser.checkBlackList(blockSites[block],block),block)) == 0:
525 >                    noSiteBlock.append( spanRanges(jobsOfBlock[block]) )
526 >                    bloskNoSite.append( blockCounter )
527  
528          common.logger.message(screenOutput)
529 +        if len(noSiteBlock) > 0 and len(bloskNoSite) > 0:
530 +            msg = 'WARNING: No sites are hosting any part of data for block:\n                '
531 +            virgola = ""
532 +            if len(bloskNoSite) > 1:
533 +                virgola = ","
534 +            for block in bloskNoSite:
535 +                msg += ' ' + str(block) + virgola
536 +            msg += '\n               Related jobs:\n                 '
537 +            virgola = ""
538 +            if len(noSiteBlock) > 1:
539 +                virgola = ","
540 +            for range_jobs in noSiteBlock:
541 +                msg += str(range_jobs) + virgola
542 +            msg += '\n               will not be submitted and this block of data can not be analyzed!\n'
543 +            if self.cfg_params.has_key('EDG.se_white_list'):
544 +                msg += 'WARNING: SE White List: '+self.cfg_params['EDG.se_white_list']+'\n'
545 +                msg += '(Hint: By whitelisting you force the job to run at this particular site(s).\n'
546 +                msg += 'Please check if the dataset is available at this site!)\n'
547 +            if self.cfg_params.has_key('EDG.ce_white_list'):
548 +                msg += 'WARNING: CE White List: '+self.cfg_params['EDG.ce_white_list']+'\n'
549 +                msg += '(Hint: By whitelisting you force the job to run at this particular site(s).\n'
550 +                msg += 'Please check if the dataset is available at this site!)\n'
551 +
552 +            common.logger.message(msg)
553  
554          self.list_of_args = list_of_lists
555          return
# Line 580 | Line 559 | class Cmssw(JobType):
559          Perform job splitting based on number of event per job
560          """
561          common.logger.debug(5,'Splitting per events')
562 <        common.logger.message('Required '+str(self.eventsPerJob)+' events per job ')
563 <        common.logger.message('Required '+str(self.theNumberOfJobs)+' jobs in total ')
564 <        common.logger.message('Required '+str(self.total_number_of_events)+' events in total ')
562 >
563 >        if (self.selectEventsPerJob):
564 >            common.logger.message('Required '+str(self.eventsPerJob)+' events per job ')
565 >        if (self.selectNumberOfJobs):
566 >            common.logger.message('Required '+str(self.theNumberOfJobs)+' jobs in total ')
567 >        if (self.selectTotalNumberEvents):
568 >            common.logger.message('Required '+str(self.total_number_of_events)+' events in total ')
569  
570          if (self.total_number_of_events < 0):
571              msg='Cannot split jobs per Events with "-1" as total number of events'
# Line 591 | Line 574 | class Cmssw(JobType):
574          if (self.selectEventsPerJob):
575              if (self.selectTotalNumberEvents):
576                  self.total_number_of_jobs = int(self.total_number_of_events/self.eventsPerJob)
577 <            elif(self.selectNumberOfJobs) :  
577 >            elif(self.selectNumberOfJobs) :
578                  self.total_number_of_jobs =self.theNumberOfJobs
579 <                self.total_number_of_events =int(self.theNumberOfJobs*self.eventsPerJob)
579 >                self.total_number_of_events =int(self.theNumberOfJobs*self.eventsPerJob)
580  
581          elif (self.selectNumberOfJobs) :
582              self.total_number_of_jobs = self.theNumberOfJobs
583              self.eventsPerJob = int(self.total_number_of_events/self.total_number_of_jobs)
584 <
584 >
585          common.logger.debug(5,'N jobs  '+str(self.total_number_of_jobs))
586  
587          # is there any remainder?
# Line 614 | Line 597 | class Cmssw(JobType):
597          self.list_of_args = []
598          for i in range(self.total_number_of_jobs):
599              ## Since there is no input, any site is good
600 <           # self.jobDestination.append(["Any"])
618 <            self.jobDestination.append([""]) #must be empty to write correctly the xml
600 >            self.jobDestination.append([""]) #must be empty to write correctly the xml
601              args=[]
602              if (self.firstRun):
603 <                    ## pythia first run
622 <                #self.list_of_args.append([(str(self.firstRun)+str(i))])
603 >                ## pythia first run
604                  args.append(str(self.firstRun)+str(i))
624 –            else:
625 –                ## no first run
626 –                #self.list_of_args.append([str(i)])
627 –                args.append(str(i))
605              if (self.sourceSeed):
606                  args.append(str(self.sourceSeed)+str(i))
607                  if (self.sourceSeedVtx):
# Line 633 | Line 610 | class Cmssw(JobType):
610                  if (self.sourceSeedG4):
611                      ## + G4 random seed
612                      args.append(str(self.sourceSeedG4)+str(i))
613 <                if (self.sourceSeedMix):    
613 >                if (self.sourceSeedMix):
614                      ## + Mix random seed
615                      args.append(str(self.sourceSeedMix)+str(i))
616                  pass
617              pass
618              self.list_of_args.append(args)
619          pass
643 –            
644 –        # print self.list_of_args
620  
621          return
622  
# Line 670 | Line 645 | class Cmssw(JobType):
645          return
646  
647      def split(self, jobParams):
648 <
648 >
649          common.jobDB.load()
650          #### Fabio
651          njobs = self.total_number_of_jobs
# Line 678 | Line 653 | class Cmssw(JobType):
653          # create the empty structure
654          for i in range(njobs):
655              jobParams.append("")
656 <        
656 >
657          for job in range(njobs):
658              jobParams[job] = arglist[job]
659              # print str(arglist[job])
# Line 689 | Line 664 | class Cmssw(JobType):
664  
665          common.jobDB.save()
666          return
667 <    
667 >
668      def getJobTypeArguments(self, nj, sched):
669          result = ''
670          for i in common.jobDB.arguments(nj):
671              result=result+str(i)+" "
672          return result
673 <  
673 >
674      def numberOfJobs(self):
675          # Fabio
676          return self.total_number_of_jobs
# Line 704 | Line 679 | class Cmssw(JobType):
679          """
680          Return the TarBall with lib and exe
681          """
682 <        
682 >
683          # if it exist, just return it
684          #
685          # Marco. Let's start to use relative path for Boss XML files
# Line 727 | Line 702 | class Cmssw(JobType):
702          # print "swVersion = ", swVersion
703          swReleaseTop = self.scram.getReleaseTop_()
704          #print "swReleaseTop = ", swReleaseTop
705 <        
705 >
706          ## check if working area is release top
707          if swReleaseTop == '' or swArea == swReleaseTop:
708              return
# Line 740 | Line 715 | class Cmssw(JobType):
715                  exeWithPath = self.scram.findFile_(executable)
716                  if ( not exeWithPath ):
717                      raise CrabException('User executable '+executable+' not found')
718 <    
718 >
719                  ## then check if it's private or not
720                  if exeWithPath.find(swReleaseTop) == -1:
721                      # the exe is private, so we must ship
# Line 749 | Line 724 | class Cmssw(JobType):
724                      # distinguish case when script is in user project area or given by full path somewhere else
725                      if exeWithPath.find(path) >= 0 :
726                          exe = string.replace(exeWithPath, path,'')
727 <                        tar.add(path+exe,os.path.basename(executable))
727 >                        tar.add(path+exe,exe)
728                      else :
729                          tar.add(exeWithPath,os.path.basename(executable))
730                      pass
731                  else:
732                      # the exe is from release, we'll find it on WN
733                      pass
734 <    
734 >
735              ## Now get the libraries: only those in local working area
736              libDir = 'lib'
737              lib = swArea+'/' +libDir
738              common.logger.debug(5,"lib "+lib+" to be tarred")
739              if os.path.exists(lib):
740                  tar.add(lib,libDir)
741 <    
741 >
742              ## Now check if module dir is present
743              moduleDir = 'module'
744              module = swArea + '/' + moduleDir
# Line 777 | Line 752 | class Cmssw(JobType):
752                      common.logger.debug(5,"data "+root+"/data"+" to be tarred")
753                      tar.add(root+"/data",root[swAreaLen:]+"/data")
754  
755 <            ## Add ProdAgent dir to tar
756 <            paDir = 'ProdAgentApi'
757 <            pa = os.environ['CRABDIR'] + '/' + 'ProdAgentApi'
758 <            if os.path.isdir(pa):
759 <                tar.add(pa,paDir)
755 >            ### Removed ProdAgent Api dependencies ###
756 >            ### Add ProdAgent dir to tar
757 >            #paDir = 'ProdAgentApi'
758 >            #pa = os.environ['CRABDIR'] + '/' + 'ProdAgentApi'
759 >            #if os.path.isdir(pa):
760 >            #    tar.add(pa,paDir)
761  
762 <            ### FEDE FOR DBS PUBLICATION
787 <            ## Add PRODCOMMON dir to tar
762 >            ## Add ProdCommon dir to tar
763              prodcommonDir = 'ProdCommon'
764              prodcommonPath = os.environ['CRABDIR'] + '/' + 'ProdCommon'
765              if os.path.isdir(prodcommonPath):
766                  tar.add(prodcommonPath,prodcommonDir)
767 <            #############################    
793 <        
767 >
768              common.logger.debug(5,"Files added to "+self.tgzNameWithPath+" : "+str(tar.getnames()))
769              tar.close()
770          except :
# Line 802 | Line 776 | class Cmssw(JobType):
776              raise CrabException('Input sandbox size of ' + str(float(tarballinfo.st_size)/1024.0/1024.0) + ' MB is larger than the allowed ' + str(self.MaxTarBallSize) + ' MB input sandbox limit and not supported by the used GRID submission system. Please make sure that no unnecessary files are in all data directories in your local CMSSW project area as they are automatically packed into the input sandbox.')
777  
778          ## create tar-ball with ML stuff
779 <        self.MLtgzfile =  common.work_space.pathForTgz()+'share/MLfiles.tgz'
779 >        self.MLtgzfile =  common.work_space.pathForTgz()+'share/MLfiles.tgz'
780          try:
781              tar = tarfile.open(self.MLtgzfile, "w:gz")
782              path=os.environ['CRABDIR'] + '/python/'
# Line 812 | Line 786 | class Cmssw(JobType):
786              tar.close()
787          except :
788              raise CrabException('Could not create ML files tar-ball')
789 <        
789 >
790          return
791 <        
791 >
792      def additionalInputFileTgz(self):
793          """
794          Put all additional files into a tar ball and return its name
# Line 834 | Line 808 | class Cmssw(JobType):
808          the execution environment for the job 'nj'.
809          """
810          # Prepare JobType-independent part
811 <        txt = ''
812 <  
813 <        ## OLI_Daniele at this level  middleware already known
840 <
841 <        txt += 'echo "### Firtst set SCRAM ARCH and BUILD_ARCH ###"\n'
842 <        txt += 'echo "Setting SCRAM_ARCH='+self.executable_arch+'"\n'
843 <        txt += 'export SCRAM_ARCH='+self.executable_arch+'\n'
844 <        txt += 'export BUILD_ARCH='+self.executable_arch+'\n'
845 <        txt += 'if [ $middleware == LCG ]; then \n'
811 >        txt = ''
812 >        txt += 'echo ">>> setup environment"\n'
813 >        txt += 'if [ $middleware == LCG ]; then \n'
814          txt += self.wsSetupCMSLCGEnvironment_()
815          txt += 'elif [ $middleware == OSG ]; then\n'
816          txt += '    WORKING_DIR=`/bin/mktemp  -d $OSG_WN_TMP/cms_XXXXXXXXXXXX`\n'
817 <        txt += '    echo "Created working directory: $WORKING_DIR"\n'
850 <        txt += '    if [ ! -d $WORKING_DIR ] ;then\n'
817 >        txt += '    if [ ! $? == 0 ] ;then\n'
818          txt += '        echo "SET_CMS_ENV 10016 ==> OSG $WORKING_DIR could not be created on WN `hostname`"\n'
819 <        txt += '    echo "JOB_EXIT_STATUS = 10016"\n'
820 <        txt += '    echo "JobExitCode=10016" | tee -a $RUNTIME_AREA/$repo\n'
821 <        txt += '    dumpStatus $RUNTIME_AREA/$repo\n'
855 <        txt += '        rm -f $RUNTIME_AREA/$repo \n'
856 <        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
857 <        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
819 >        txt += '        echo "JOB_EXIT_STATUS = 10016"\n'
820 >        txt += '        echo "JobExitCode=10016" | tee -a $RUNTIME_AREA/$repo\n'
821 >        txt += '        dumpStatus $RUNTIME_AREA/$repo\n'
822          txt += '        exit 1\n'
823          txt += '    fi\n'
824 +        txt += '    echo ">>> Created working directory: $WORKING_DIR"\n'
825          txt += '\n'
826          txt += '    echo "Change to working directory: $WORKING_DIR"\n'
827          txt += '    cd $WORKING_DIR\n'
828 <        txt += self.wsSetupCMSOSGEnvironment_()
828 >        txt += '    echo ">>> current directory (WORKING_DIR): $WORKING_DIR"\n'
829 >        txt += self.wsSetupCMSOSGEnvironment_()
830 >        #txt += '    echo "### Set SCRAM ARCH to ' + self.executable_arch + ' ###"\n'
831 >        #txt += '    export SCRAM_ARCH='+self.executable_arch+'\n'
832          txt += 'fi\n'
833  
834          # Prepare JobType-specific part
835          scram = self.scram.commandName()
836          txt += '\n\n'
837 <        txt += 'echo "### SPECIFIC JOB SETUP ENVIRONMENT ###"\n'
837 >        txt += 'echo ">>> specific cmssw setup environment:"\n'
838 >        txt += 'echo "CMSSW_VERSION =  '+self.version+'"\n'
839          txt += scram+' project CMSSW '+self.version+'\n'
840          txt += 'status=$?\n'
841          txt += 'if [ $status != 0 ] ; then\n'
842 <        txt += '   echo "SET_EXE_ENV 10034 ==>ERROR CMSSW '+self.version+' not found on `hostname`" \n'
843 <        txt += '   echo "JOB_EXIT_STATUS = 10034"\n'
844 <        txt += '   echo "JobExitCode=10034" | tee -a $RUNTIME_AREA/$repo\n'
845 <        txt += '   dumpStatus $RUNTIME_AREA/$repo\n'
877 <        txt += '   rm -f $RUNTIME_AREA/$repo \n'
878 <        txt += '   echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
879 <        txt += '   echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
880 <        ## OLI_Daniele
842 >        txt += '    echo "SET_EXE_ENV 10034 ==>ERROR CMSSW '+self.version+' not found on `hostname`" \n'
843 >        txt += '    echo "JOB_EXIT_STATUS = 10034"\n'
844 >        txt += '    echo "JobExitCode=10034" | tee -a $RUNTIME_AREA/$repo\n'
845 >        txt += '    dumpStatus $RUNTIME_AREA/$repo\n'
846          txt += '    if [ $middleware == OSG ]; then \n'
882 –        txt += '        echo "Remove working directory: $WORKING_DIR"\n'
847          txt += '        cd $RUNTIME_AREA\n'
848 +        txt += '        echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n'
849 +        txt += '        echo ">>> Remove working directory: $WORKING_DIR"\n'
850          txt += '        /bin/rm -rf $WORKING_DIR\n'
851          txt += '        if [ -d $WORKING_DIR ] ;then\n'
852          txt += '            echo "SET_CMS_ENV 10018 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after CMSSW CMSSW_0_6_1 not found on `hostname`"\n'
853          txt += '            echo "JOB_EXIT_STATUS = 10018"\n'
854          txt += '            echo "JobExitCode=10018" | tee -a $RUNTIME_AREA/$repo\n'
855          txt += '            dumpStatus $RUNTIME_AREA/$repo\n'
890 –        txt += '            rm -f $RUNTIME_AREA/$repo \n'
891 –        txt += '            echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
892 –        txt += '            echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
856          txt += '        fi\n'
857          txt += '    fi \n'
858 <        txt += '   exit 1 \n'
858 >        txt += '    exit 1 \n'
859          txt += 'fi \n'
897 –        txt += 'echo "CMSSW_VERSION =  '+self.version+'"\n'
860          txt += 'cd '+self.version+'\n'
861          ########## FEDE FOR DBS2 ######################
862          txt += 'SOFTWARE_DIR=`pwd`\n'
863 <        txt += 'echo SOFTWARE_DIR=$SOFTWARE_DIR \n'
863 >        txt += 'echo ">>> current directory (SOFTWARE_DIR): $SOFTWARE_DIR" \n'
864          ###############################################
865          ### needed grep for bug in scramv1 ###
904 –        txt += scram+' runtime -sh\n'
866          txt += 'eval `'+scram+' runtime -sh | grep -v SCRAMRT_LSB_JOBNAME`\n'
906 –        txt += 'echo $PATH\n'
907 –
867          # Handle the arguments:
868          txt += "\n"
869          txt += "## number of arguments (first argument always jobnumber)\n"
870          txt += "\n"
871 < #        txt += "narg=$#\n"
913 <        txt += "if [ $nargs -lt 2 ]\n"
871 >        txt += "if [ $nargs -lt "+str(len(self.argsList[nj].split()))+" ]\n"
872          txt += "then\n"
873          txt += "    echo 'SET_EXE_ENV 1 ==> ERROR Too few arguments' +$nargs+ \n"
874          txt += '    echo "JOB_EXIT_STATUS = 50113"\n'
875          txt += '    echo "JobExitCode=50113" | tee -a $RUNTIME_AREA/$repo\n'
876          txt += '    dumpStatus $RUNTIME_AREA/$repo\n'
919 –        txt += '    rm -f $RUNTIME_AREA/$repo \n'
920 –        txt += '    echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
921 –        txt += '    echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
922 –        ## OLI_Daniele
877          txt += '    if [ $middleware == OSG ]; then \n'
924 –        txt += '        echo "Remove working directory: $WORKING_DIR"\n'
878          txt += '        cd $RUNTIME_AREA\n'
879 +        txt += '        echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n'
880 +        txt += '        echo ">>> Remove working directory: $WORKING_DIR"\n'
881          txt += '        /bin/rm -rf $WORKING_DIR\n'
882          txt += '        if [ -d $WORKING_DIR ] ;then\n'
883          txt += '            echo "SET_EXE_ENV 50114 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after Too few arguments for CRAB job wrapper"\n'
884          txt += '            echo "JOB_EXIT_STATUS = 50114"\n'
885          txt += '            echo "JobExitCode=50114" | tee -a $RUNTIME_AREA/$repo\n'
886          txt += '            dumpStatus $RUNTIME_AREA/$repo\n'
932 –        txt += '            rm -f $RUNTIME_AREA/$repo \n'
933 –        txt += '            echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
934 –        txt += '            echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
887          txt += '        fi\n'
888          txt += '    fi \n'
889          txt += "    exit 1\n"
# Line 941 | Line 893 | class Cmssw(JobType):
893          # Prepare job-specific part
894          job = common.job_list[nj]
895          ### FEDE FOR DBS OUTPUT PUBLICATION
896 <        if (self.datasetPath):
896 >        if (self.datasetPath):
897              txt += '\n'
898              txt += 'DatasetPath='+self.datasetPath+'\n'
899  
900              datasetpath_split = self.datasetPath.split("/")
901 <            
901 >
902              txt += 'PrimaryDataset='+datasetpath_split[1]+'\n'
903              txt += 'DataTier='+datasetpath_split[2]+'\n'
952 –            #txt += 'ProcessedDataset='+datasetpath_split[3]+'\n'
904              txt += 'ApplicationFamily=cmsRun\n'
905  
906          else:
907              txt += 'DatasetPath=MCDataTier\n'
908              txt += 'PrimaryDataset=null\n'
909              txt += 'DataTier=null\n'
959 –            #txt += 'ProcessedDataset=null\n'
910              txt += 'ApplicationFamily=MCDataTier\n'
911          if self.pset != None: #CarlosDaniele
912              pset = os.path.basename(job.configFilename())
913              txt += '\n'
914              txt += 'cp  $RUNTIME_AREA/'+pset+' .\n'
915              if (self.datasetPath): # standard job
966 –                #txt += 'InputFiles=$2\n'
916                  txt += 'InputFiles=${args[1]}\n'
917                  txt += 'MaxEvents=${args[2]}\n'
918                  txt += 'SkipEvents=${args[3]}\n'
919                  txt += 'echo "Inputfiles:<$InputFiles>"\n'
920 <                txt += 'sed "s#{\'INPUT\'}#$InputFiles#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
920 >                txt += 'sed "s#\'INPUTFILE\'#$InputFiles#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
921                  txt += 'echo "MaxEvents:<$MaxEvents>"\n'
922 <                txt += 'sed "s#INPUTMAXEVENTS#$MaxEvents#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
922 >                txt += 'sed "s#int32 input = 0#int32 input = $MaxEvents#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
923                  txt += 'echo "SkipEvents:<$SkipEvents>"\n'
924 <                txt += 'sed "s#INPUTSKIPEVENTS#$SkipEvents#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
924 >                txt += 'sed "s#uint32 skipEvents = 0#uint32 skipEvents = $SkipEvents#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
925              else:  # pythia like job
926                  seedIndex=1
927                  if (self.firstRun):
928                      txt += 'FirstRun=${args['+str(seedIndex)+']}\n'
929                      txt += 'echo "FirstRun: <$FirstRun>"\n'
930 <                    txt += 'sed "s#\<INPUTFIRSTRUN\>#$FirstRun#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
930 >                    txt += 'sed "s#uint32 firstRun = 0#uint32 firstRun = $FirstRun#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
931                      seedIndex=seedIndex+1
932  
933                  if (self.sourceSeed):
934                      txt += 'Seed=${args['+str(seedIndex)+']}\n'
935 <                    txt += 'sed "s#\<INPUT\>#$Seed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
935 >                    txt += 'sed "s#uint32 sourceSeed = 0#uint32 sourceSeed = $Seed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
936                      seedIndex=seedIndex+1
937                      ## the following seeds are not always present
938                      if (self.sourceSeedVtx):
939                          txt += 'VtxSeed=${args['+str(seedIndex)+']}\n'
940                          txt += 'echo "VtxSeed: <$VtxSeed>"\n'
941 <                        txt += 'sed "s#\<INPUTVTX\>#$VtxSeed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
941 >                        txt += 'sed "s#uint32 VtxSmeared = 0#uint32 VtxSmeared = $VtxSeed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
942                          seedIndex += 1
943                      if (self.sourceSeedG4):
944                          txt += 'G4Seed=${args['+str(seedIndex)+']}\n'
945                          txt += 'echo "G4Seed: <$G4Seed>"\n'
946 <                        txt += 'sed "s#\<INPUTG4\>#$G4Seed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
946 >                        txt += 'sed "s#uint32 g4SimHits = 0#uint32 g4SimHits = $G4Seed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
947                          seedIndex += 1
948                      if (self.sourceSeedMix):
949                          txt += 'mixSeed=${args['+str(seedIndex)+']}\n'
950                          txt += 'echo "MixSeed: <$mixSeed>"\n'
951 <                        txt += 'sed "s#\<INPUTMIX\>#$mixSeed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
951 >                        txt += 'sed "s#uint32 mix = 0#uint32 mix = $mixSeed#" '+pset+' > tmp && mv -f tmp '+pset+'\n'
952                          seedIndex += 1
953                      pass
954                  pass
# Line 1009 | Line 958 | class Cmssw(JobType):
958              txt += 'if [ -e $RUNTIME_AREA/'+self.additional_tgz_name+' ] ; then\n'
959              txt += '  tar xzvf $RUNTIME_AREA/'+self.additional_tgz_name+'\n'
960              txt += 'fi\n'
961 <            pass
961 >            pass
962  
963          if self.pset != None: #CarlosDaniele
1015 –            txt += 'echo "### END JOB SETUP ENVIRONMENT ###"\n\n'
1016 –        
964              txt += '\n'
965              txt += 'echo "***** cat pset.cfg *********"\n'
966              txt += 'cat pset.cfg\n'
# Line 1022 | Line 969 | class Cmssw(JobType):
969              ### FEDE FOR DBS OUTPUT PUBLICATION
970              txt += 'PSETHASH=`EdmConfigHash < pset.cfg` \n'
971              txt += 'echo "PSETHASH = $PSETHASH" \n'
972 <            ##############
972 >            ##############
973              txt += '\n'
1027 –            # txt += 'echo "***** cat pset1.cfg *********"\n'
1028 –            # txt += 'cat pset1.cfg\n'
1029 –            # txt += 'echo "****** end pset1.cfg ********"\n'
974          return txt
975  
976      def wsBuildExe(self, nj=0):
# Line 1038 | Line 982 | class Cmssw(JobType):
982          txt = ""
983  
984          if os.path.isfile(self.tgzNameWithPath):
985 <            txt += 'echo "tar xzvf $RUNTIME_AREA/'+os.path.basename(self.tgzNameWithPath)+'"\n'
985 >            txt += 'echo ">>> tar xzvf $RUNTIME_AREA/'+os.path.basename(self.tgzNameWithPath)+' :" \n'
986              txt += 'tar xzvf $RUNTIME_AREA/'+os.path.basename(self.tgzNameWithPath)+'\n'
987              txt += 'untar_status=$? \n'
988              txt += 'if [ $untar_status -ne 0 ]; then \n'
# Line 1046 | Line 990 | class Cmssw(JobType):
990              txt += '   echo "JOB_EXIT_STATUS = $untar_status" \n'
991              txt += '   echo "JobExitCode=$untar_status" | tee -a $RUNTIME_AREA/$repo\n'
992              txt += '   if [ $middleware == OSG ]; then \n'
1049 –            txt += '       echo "Remove working directory: $WORKING_DIR"\n'
993              txt += '       cd $RUNTIME_AREA\n'
994 +            txt += '        echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n'
995 +            txt += '        echo ">>> Remove working directory: $WORKING_DIR"\n'
996              txt += '       /bin/rm -rf $WORKING_DIR\n'
997              txt += '       if [ -d $WORKING_DIR ] ;then\n'
998              txt += '           echo "SET_EXE 50999 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after Untarring .tgz file failed"\n'
999              txt += '           echo "JOB_EXIT_STATUS = 50999"\n'
1000              txt += '           echo "JobExitCode=50999" | tee -a $RUNTIME_AREA/$repo\n'
1001              txt += '           dumpStatus $RUNTIME_AREA/$repo\n'
1057 –            txt += '           rm -f $RUNTIME_AREA/$repo \n'
1058 –            txt += '           echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1059 –            txt += '           echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1002              txt += '       fi\n'
1003              txt += '   fi \n'
1004              txt += '   \n'
# Line 1065 | Line 1007 | class Cmssw(JobType):
1007              txt += '   echo "Successful untar" \n'
1008              txt += 'fi \n'
1009              txt += '\n'
1010 <            txt += 'echo "Include ProdAgentApi and PRODCOMMON in PYTHONPATH"\n'
1010 >            #### Removed ProdAgent API dependencies
1011 >            txt += 'echo ">>> Include ProdCommon in PYTHONPATH:"\n'
1012              txt += 'if [ -z "$PYTHONPATH" ]; then\n'
1013              #### FEDE FOR DBS OUTPUT PUBLICATION
1014 <            txt += '   export PYTHONPATH=$SOFTWARE_DIR/ProdAgentApi:$SOFTWARE_DIR/ProdCommon\n'
1072 <            #txt += '   export PYTHONPATH=`pwd`/ProdAgentApi:`pwd`/ProdCommon\n'
1073 <            #txt += '   export PYTHONPATH=ProdAgentApi\n'
1014 >            txt += '   export PYTHONPATH=$SOFTWARE_DIR/ProdCommon\n'
1015              txt += 'else\n'
1016 <            txt += '   export PYTHONPATH=$SOFTWARE_DIR/ProdAgentApi:$SOFTWARE_DIR/ProdCommon:${PYTHONPATH}\n'
1076 <            #txt += '   export PYTHONPATH=`pwd`/ProdAgentApi:`pwd`/ProdCommon:${PYTHONPATH}\n'
1077 <            #txt += '   export PYTHONPATH=ProdAgentApi:${PYTHONPATH}\n'
1016 >            txt += '   export PYTHONPATH=$SOFTWARE_DIR/ProdCommon:${PYTHONPATH}\n'
1017              txt += 'echo "PYTHONPATH=$PYTHONPATH"\n'
1018 <            ###################  
1018 >            ###################
1019              txt += 'fi\n'
1020              txt += '\n'
1021  
1022              pass
1023 <        
1023 >
1024          return txt
1025  
1026      def modifySteeringCards(self, nj):
1027          """
1028 <        modify the card provided by the user,
1028 >        modify the card provided by the user,
1029          writing a new card into share dir
1030          """
1031 <        
1031 >
1032      def executableName(self):
1033          if self.scriptExe: #CarlosDaniele
1034              return "sh "
# Line 1100 | Line 1039 | class Cmssw(JobType):
1039          if self.scriptExe:#CarlosDaniele
1040              return   self.scriptExe + " $NJob"
1041          else:
1042 <            # if >= CMSSW_1_5_X, add -e
1042 >            # if >= CMSSW_1_5_X, add -j crab_fjr.xml
1043              version_array = self.scram.getSWVersion().split('_')
1044              major = 0
1045              minor = 0
# Line 1108 | Line 1047 | class Cmssw(JobType):
1047                  major = int(version_array[1])
1048                  minor = int(version_array[2])
1049              except:
1050 <                msg = "Cannot parse CMSSW version string: " + "_".join(version_array) + " for major and minor release number!"  
1050 >                msg = "Cannot parse CMSSW version string: " + "_".join(version_array) + " for major and minor release number!"
1051                  raise CrabException(msg)
1052              if major >= 1 and minor >= 5 :
1053 <                return " -e -p pset.cfg"
1053 >                return " -j " + self.fjrFileName + " -p pset.cfg"
1054              else:
1055                  return " -p pset.cfg"
1056  
# Line 1143 | Line 1082 | class Cmssw(JobType):
1082  
1083          ## User Declared output files
1084          for out in (self.output_file+self.output_file_sandbox):
1085 <            n_out = nj + 1
1085 >            n_out = nj + 1
1086              out_box.append(self.numberFile_(out,str(n_out)))
1087          return out_box
1088  
# Line 1159 | Line 1098 | class Cmssw(JobType):
1098          """
1099  
1100          txt = '\n'
1101 <        txt += '# directory content\n'
1101 >        txt += 'echo ">>> current directory (SOFTWARE_DIR): $SOFTWARE_DIR" \n'
1102 >        txt += 'echo ">>> current directory content:"\n'
1103          txt += 'ls \n'
1104 +        txt += '\n'
1105 +
1106 +        txt += 'output_exit_status=0\n'
1107 +
1108 +        for fileWithSuffix in (self.output_file_sandbox):
1109 +            output_file_num = self.numberFile_(fileWithSuffix, '$NJob')
1110 +            txt += '\n'
1111 +            txt += '# check output file\n'
1112 +            txt += 'if [ -e ./'+fileWithSuffix+' ] ; then\n'
1113 +            txt += '    mv '+fileWithSuffix+' $RUNTIME_AREA/'+output_file_num+'\n'
1114 +            txt += '    ln -s $RUNTIME_AREA/'+output_file_num+' $RUNTIME_AREA/'+fileWithSuffix+'\n'
1115 +            txt += 'else\n'
1116 +            txt += '    exit_status=60302\n'
1117 +            txt += '    echo "ERROR: Output file '+fileWithSuffix+' not found"\n'
1118 +            if common.scheduler.name().upper() == 'CONDOR_G':
1119 +                txt += '    if [ $middleware == OSG ]; then \n'
1120 +                txt += '        echo "prepare dummy output file"\n'
1121 +                txt += '        echo "Processing of job output failed" > $RUNTIME_AREA/'+output_file_num+'\n'
1122 +                txt += '    fi \n'
1123 +            txt += 'fi\n'
1124  
1125 <        for fileWithSuffix in (self.output_file+self.output_file_sandbox):
1125 >        for fileWithSuffix in (self.output_file):
1126              output_file_num = self.numberFile_(fileWithSuffix, '$NJob')
1127              txt += '\n'
1128              txt += '# check output file\n'
1169 –            # txt += 'ls '+fileWithSuffix+'\n'
1170 –            # txt += 'ls_result=$?\n'
1129              txt += 'if [ -e ./'+fileWithSuffix+' ] ; then\n'
1130 <            txt += '   mv '+fileWithSuffix+' $RUNTIME_AREA/'+output_file_num+'\n'
1130 >            if (self.copy_data == 1):  # For OSG nodes, file is in $WORKING_DIR, should not be moved to $RUNTIME_AREA
1131 >                txt += '    mv '+fileWithSuffix+' '+output_file_num+'\n'
1132 >                txt += '    ln -s `pwd`/'+output_file_num+' $RUNTIME_AREA/'+fileWithSuffix+'\n'
1133 >            else:
1134 >                txt += '    mv '+fileWithSuffix+' $RUNTIME_AREA/'+output_file_num+'\n'
1135 >                txt += '    ln -s $RUNTIME_AREA/'+output_file_num+' $RUNTIME_AREA/'+fileWithSuffix+'\n'
1136              txt += 'else\n'
1137 <            txt += '   exit_status=60302\n'
1138 <            txt += '   echo "ERROR: Problem with output file '+fileWithSuffix+'"\n'
1139 <            if common.scheduler.boss_scheduler_name == 'condor_g':
1137 >            txt += '    exit_status=60302\n'
1138 >            txt += '    echo "ERROR: Output file '+fileWithSuffix+' not found"\n'
1139 >            txt += '    echo "JOB_EXIT_STATUS = $exit_status"\n'
1140 >            txt += '    output_exit_status=$exit_status\n'
1141 >            if common.scheduler.name().upper() == 'CONDOR_G':
1142                  txt += '    if [ $middleware == OSG ]; then \n'
1143                  txt += '        echo "prepare dummy output file"\n'
1144                  txt += '        echo "Processing of job output failed" > $RUNTIME_AREA/'+output_file_num+'\n'
# Line 1182 | Line 1147 | class Cmssw(JobType):
1147          file_list = []
1148          for fileWithSuffix in (self.output_file):
1149               file_list.append(self.numberFile_(fileWithSuffix, '$NJob'))
1150 +
1151          txt += 'file_list="'+string.join(file_list,' ')+'"\n'
1152 <      
1152 >        txt += '\n'
1153 >        txt += 'echo ">>> current directory (SOFTWARE_DIR): $SOFTWARE_DIR" \n'
1154 >        txt += 'echo ">>> current directory content:"\n'
1155 >        txt += 'ls \n'
1156 >        txt += '\n'
1157          txt += 'cd $RUNTIME_AREA\n'
1158 <        #### FEDE this is the cleanEnv function
1189 <        ### OLI_DANIELE
1190 <        #txt += 'if [ $middleware == OSG ]; then\n'  
1191 <        #txt += '    cd $RUNTIME_AREA\n'
1192 <        #txt += '    echo "Remove working directory: $WORKING_DIR"\n'
1193 <        #txt += '    /bin/rm -rf $WORKING_DIR\n'
1194 <        #txt += '    if [ -d $WORKING_DIR ] ;then\n'
1195 <        #txt += '        echo "SET_EXE 60999 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after cleanup of WN"\n'
1196 <        #txt += '        echo "JOB_EXIT_STATUS = 60999"\n'
1197 <        #txt += '        echo "JobExitCode=60999" | tee -a $RUNTIME_AREA/$repo\n'
1198 <        #txt += '        dumpStatus $RUNTIME_AREA/$repo\n'
1199 <        #txt += '        rm -f $RUNTIME_AREA/$repo \n'
1200 <        #txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1201 <        #txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1202 <        #txt += '    fi\n'
1203 <        #txt += 'fi\n'
1204 <        #txt += '\n'
1205 <
1206 <
1158 >        txt += 'echo ">>> current directory (RUNTIME_AREA):  $RUNTIME_AREA"\n'
1159          return txt
1160  
1161      def numberFile_(self, file, txt):
# Line 1221 | Line 1173 | class Cmssw(JobType):
1173              result = name + '_' + txt + "." + ext
1174          else:
1175              result = name + '_' + txt
1176 <        
1176 >
1177          return result
1178  
1179      def getRequirements(self, nj=[]):
1180          """
1181 <        return job requirements to add to jdl files
1181 >        return job requirements to add to jdl files
1182          """
1183          req = ''
1184          if self.version:
# Line 1234 | Line 1186 | class Cmssw(JobType):
1186                   self.version + \
1187                   '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
1188          ## SL add requirement for OS version only if SL4
1189 <        reSL4 = re.compile( r'slc4' )
1190 <        if self.executable_arch and reSL4.search(self.executable_arch):
1189 >        #reSL4 = re.compile( r'slc4' )
1190 >        if self.executable_arch: # and reSL4.search(self.executable_arch):
1191              req+=' && Member("VO-cms-' + \
1192                   self.executable_arch + \
1193                   '", other.GlueHostApplicationSoftwareRunTimeEnvironment)'
# Line 1248 | Line 1200 | class Cmssw(JobType):
1200          """ return the config filename """
1201          return self.name()+'.cfg'
1202  
1251 –    ### OLI_DANIELE
1203      def wsSetupCMSOSGEnvironment_(self):
1204          """
1205          Returns part of a job script which is prepares
1206          the execution environment and which is common for all CMS jobs.
1207          """
1208 <        txt = '\n'
1209 <        txt += '   echo "### SETUP CMS OSG  ENVIRONMENT ###"\n'
1210 <        txt += '   if [ -f $GRID3_APP_DIR/cmssoft/cmsset_default.sh ] ;then\n'
1211 <        txt += '      # Use $GRID3_APP_DIR/cmssoft/cmsset_default.sh to setup cms software\n'
1212 <        txt += '       export SCRAM_ARCH='+self.executable_arch+'\n'
1262 <        txt += '       source $GRID3_APP_DIR/cmssoft/cmsset_default.sh '+self.version+'\n'
1263 <        txt += '   elif [ -f $OSG_APP/cmssoft/cms/cmsset_default.sh ] ;then\n'
1208 >        txt = '    echo ">>> setup CMS OSG environment:"\n'
1209 >        txt += '    echo "set SCRAM ARCH to ' + self.executable_arch + '"\n'
1210 >        txt += '    export SCRAM_ARCH='+self.executable_arch+'\n'
1211 >        txt += '    echo "SCRAM_ARCH = $SCRAM_ARCH"\n'
1212 >        txt += '    if [ -f $OSG_APP/cmssoft/cms/cmsset_default.sh ] ;then\n'
1213          txt += '      # Use $OSG_APP/cmssoft/cms/cmsset_default.sh to setup cms software\n'
1214 <        txt += '       export SCRAM_ARCH='+self.executable_arch+'\n'
1215 <        txt += '       source $OSG_APP/cmssoft/cms/cmsset_default.sh '+self.version+'\n'
1216 <        txt += '   else\n'
1217 <        txt += '       echo "SET_CMS_ENV 10020 ==> ERROR $GRID3_APP_DIR/cmssoft/cmsset_default.sh and $OSG_APP/cmssoft/cms/cmsset_default.sh file not found"\n'
1218 <        txt += '       echo "JOB_EXIT_STATUS = 10020"\n'
1219 <        txt += '       echo "JobExitCode=10020" | tee -a $RUNTIME_AREA/$repo\n'
1271 <        txt += '       dumpStatus $RUNTIME_AREA/$repo\n'
1272 <        txt += '       rm -f $RUNTIME_AREA/$repo \n'
1273 <        txt += '       echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1274 <        txt += '       echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1275 <        txt += '       exit 1\n'
1214 >        txt += '        source $OSG_APP/cmssoft/cms/cmsset_default.sh '+self.version+'\n'
1215 >        txt += '    else\n'
1216 >        txt += '        echo "SET_CMS_ENV 10020 ==> ERROR $OSG_APP/cmssoft/cms/cmsset_default.sh file not found"\n'
1217 >        txt += '        echo "JOB_EXIT_STATUS = 10020"\n'
1218 >        txt += '        echo "JobExitCode=10020" | tee -a $RUNTIME_AREA/$repo\n'
1219 >        txt += '        dumpStatus $RUNTIME_AREA/$repo\n'
1220          txt += '\n'
1221 <        txt += '       echo "Remove working directory: $WORKING_DIR"\n'
1222 <        txt += '       cd $RUNTIME_AREA\n'
1223 <        txt += '       /bin/rm -rf $WORKING_DIR\n'
1224 <        txt += '       if [ -d $WORKING_DIR ] ;then\n'
1225 <        txt += '           echo "SET_CMS_ENV 10017 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after $GRID3_APP_DIR/cmssoft/cmsset_default.sh and $OSG_APP/cmssoft/cms/cmsset_default.sh file not found"\n'
1226 <        txt += '           echo "JOB_EXIT_STATUS = 10017"\n'
1227 <        txt += '           echo "JobExitCode=10017" | tee -a $RUNTIME_AREA/$repo\n'
1228 <        txt += '           dumpStatus $RUNTIME_AREA/$repo\n'
1229 <        txt += '           rm -f $RUNTIME_AREA/$repo \n'
1230 <        txt += '           echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1287 <        txt += '           echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1288 <        txt += '       fi\n'
1221 >        txt += '        cd $RUNTIME_AREA\n'
1222 >        txt += '        echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n'
1223 >        txt += '        echo ">>> Remove working directory: $WORKING_DIR"\n'
1224 >        txt += '        /bin/rm -rf $WORKING_DIR\n'
1225 >        txt += '        if [ -d $WORKING_DIR ] ;then\n'
1226 >        txt += '            echo "SET_CMS_ENV 10017 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after $OSG_APP/cmssoft/cms/cmsset_default.sh file not found"\n'
1227 >        txt += '            echo "JOB_EXIT_STATUS = 10017"\n'
1228 >        txt += '            echo "JobExitCode=10017" | tee -a $RUNTIME_AREA/$repo\n'
1229 >        txt += '            dumpStatus $RUNTIME_AREA/$repo\n'
1230 >        txt += '        fi\n'
1231          txt += '\n'
1232 <        txt += '       exit 1\n'
1233 <        txt += '   fi\n'
1232 >        txt += '        exit 1\n'
1233 >        txt += '    fi\n'
1234          txt += '\n'
1235 <        txt += '   echo "SET_CMS_ENV 0 ==> setup cms environment ok"\n'
1236 <        txt += '   echo " END SETUP CMS OSG  ENVIRONMENT "\n'
1235 >        txt += '    echo "SET_CMS_ENV 0 ==> setup cms environment ok"\n'
1236 >        txt += '    echo "SCRAM_ARCH = $SCRAM_ARCH"\n'
1237  
1238          return txt
1239 <
1239 >
1240      ### OLI_DANIELE
1241      def wsSetupCMSLCGEnvironment_(self):
1242          """
1243          Returns part of a job script which is prepares
1244          the execution environment and which is common for all CMS jobs.
1245          """
1246 <        txt  = '   \n'
1247 <        txt += '   echo " ### SETUP CMS LCG  ENVIRONMENT ### "\n'
1248 <        txt += '   if [ ! $VO_CMS_SW_DIR ] ;then\n'
1249 <        txt += '       echo "SET_CMS_ENV 10031 ==> ERROR CMS software dir not found on WN `hostname`"\n'
1250 <        txt += '       echo "JOB_EXIT_STATUS = 10031" \n'
1251 <        txt += '       echo "JobExitCode=10031" | tee -a $RUNTIME_AREA/$repo\n'
1252 <        txt += '       dumpStatus $RUNTIME_AREA/$repo\n'
1253 <        txt += '       rm -f $RUNTIME_AREA/$repo \n'
1254 <        txt += '       echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1255 <        txt += '       echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1256 <        txt += '       exit 1\n'
1257 <        txt += '   else\n'
1258 <        txt += '       echo "Sourcing environment... "\n'
1259 <        txt += '       if [ ! -s $VO_CMS_SW_DIR/cmsset_default.sh ] ;then\n'
1260 <        txt += '           echo "SET_CMS_ENV 10020 ==> ERROR cmsset_default.sh file not found into dir $VO_CMS_SW_DIR"\n'
1261 <        txt += '           echo "JOB_EXIT_STATUS = 10020"\n'
1262 <        txt += '           echo "JobExitCode=10020" | tee -a $RUNTIME_AREA/$repo\n'
1263 <        txt += '           dumpStatus $RUNTIME_AREA/$repo\n'
1264 <        txt += '           rm -f $RUNTIME_AREA/$repo \n'
1265 <        txt += '           echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1266 <        txt += '           echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1267 <        txt += '           exit 1\n'
1268 <        txt += '       fi\n'
1269 <        txt += '       echo "sourcing $VO_CMS_SW_DIR/cmsset_default.sh"\n'
1270 <        txt += '       source $VO_CMS_SW_DIR/cmsset_default.sh\n'
1271 <        txt += '       result=$?\n'
1272 <        txt += '       if [ $result -ne 0 ]; then\n'
1273 <        txt += '           echo "SET_CMS_ENV 10032 ==> ERROR problem sourcing $VO_CMS_SW_DIR/cmsset_default.sh"\n'
1274 <        txt += '           echo "JOB_EXIT_STATUS = 10032"\n'
1275 <        txt += '           echo "JobExitCode=10032" | tee -a $RUNTIME_AREA/$repo\n'
1276 <        txt += '           dumpStatus $RUNTIME_AREA/$repo\n'
1277 <        txt += '           rm -f $RUNTIME_AREA/$repo \n'
1336 <        txt += '           echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1337 <        txt += '           echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1338 <        txt += '           exit 1\n'
1339 <        txt += '       fi\n'
1340 <        txt += '   fi\n'
1341 <        txt += '   \n'
1342 <        txt += '   echo "SET_CMS_ENV 0 ==> setup cms environment ok"\n'
1343 <        txt += '   echo "### END SETUP CMS LCG ENVIRONMENT ###"\n'
1246 >        txt = '    echo ">>> setup CMS LCG environment:"\n'
1247 >        txt += '    echo "set SCRAM ARCH and BUILD_ARCH to ' + self.executable_arch + ' ###"\n'
1248 >        txt += '    export SCRAM_ARCH='+self.executable_arch+'\n'
1249 >        txt += '    export BUILD_ARCH='+self.executable_arch+'\n'
1250 >        txt += '    if [ ! $VO_CMS_SW_DIR ] ;then\n'
1251 >        txt += '        echo "SET_CMS_ENV 10031 ==> ERROR CMS software dir not found on WN `hostname`"\n'
1252 >        txt += '        echo "JOB_EXIT_STATUS = 10031" \n'
1253 >        txt += '        echo "JobExitCode=10031" | tee -a $RUNTIME_AREA/$repo\n'
1254 >        txt += '        dumpStatus $RUNTIME_AREA/$repo\n'
1255 >        txt += '        exit 1\n'
1256 >        txt += '    else\n'
1257 >        txt += '        echo "Sourcing environment... "\n'
1258 >        txt += '        if [ ! -s $VO_CMS_SW_DIR/cmsset_default.sh ] ;then\n'
1259 >        txt += '            echo "SET_CMS_ENV 10020 ==> ERROR cmsset_default.sh file not found into dir $VO_CMS_SW_DIR"\n'
1260 >        txt += '            echo "JOB_EXIT_STATUS = 10020"\n'
1261 >        txt += '            echo "JobExitCode=10020" | tee -a $RUNTIME_AREA/$repo\n'
1262 >        txt += '            dumpStatus $RUNTIME_AREA/$repo\n'
1263 >        txt += '            exit 1\n'
1264 >        txt += '        fi\n'
1265 >        txt += '        echo "sourcing $VO_CMS_SW_DIR/cmsset_default.sh"\n'
1266 >        txt += '        source $VO_CMS_SW_DIR/cmsset_default.sh\n'
1267 >        txt += '        result=$?\n'
1268 >        txt += '        if [ $result -ne 0 ]; then\n'
1269 >        txt += '            echo "SET_CMS_ENV 10032 ==> ERROR problem sourcing $VO_CMS_SW_DIR/cmsset_default.sh"\n'
1270 >        txt += '            echo "JOB_EXIT_STATUS = 10032"\n'
1271 >        txt += '            echo "JobExitCode=10032" | tee -a $RUNTIME_AREA/$repo\n'
1272 >        txt += '            dumpStatus $RUNTIME_AREA/$repo\n'
1273 >        txt += '            exit 1\n'
1274 >        txt += '        fi\n'
1275 >        txt += '    fi\n'
1276 >        txt += '    \n'
1277 >        txt += '    echo "SET_CMS_ENV 0 ==> setup cms environment ok"\n'
1278          return txt
1279  
1280 <    ### FEDE FOR DBS OUTPUT PUBLICATION
1280 >    ### FEDE FOR DBS OUTPUT PUBLICATION
1281      def modifyReport(self, nj):
1282          """
1283 <        insert the part of the script that modifies the FrameworkJob Report
1283 >        insert the part of the script that modifies the FrameworkJob Report
1284          """
1285  
1286 <        txt = ''
1353 <        txt += 'echo "Modify Job Report" \n'
1354 <        #txt += 'chmod a+x $RUNTIME_AREA/'+self.version+'/ProdAgentApi/FwkJobRep/ModifyJobReport.py\n'
1355 <        ################ FEDE FOR DBS2 #############################################
1356 <        txt += 'chmod a+x $SOFTWARE_DIR/ProdAgentApi/FwkJobRep/ModifyJobReport.py\n'
1357 <        #############################################################################
1286 >        txt = ''
1287          try:
1288 <            publish_data = int(self.cfg_params['USER.publish_data'])          
1288 >            publish_data = int(self.cfg_params['USER.publish_data'])
1289          except KeyError:
1290              publish_data = 0
1291 +        if (publish_data == 1):
1292 +            txt += 'echo ">>> Modify Job Report:" \n'
1293 +            ################ FEDE FOR DBS2 #############################################
1294 +            #txt += 'chmod a+x $SOFTWARE_DIR/ProdAgentApi/FwkJobRep/ModifyJobReport.py\n'
1295 +            txt += 'chmod a+x $SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py\n'
1296 +            #############################################################################
1297  
1298 <        txt += 'if [ -z "$SE" ]; then\n'
1299 <        txt += '    SE="" \n'
1300 <        txt += 'fi \n'
1301 <        txt += 'if [ -z "$SE_PATH" ]; then\n'
1302 <        txt += '    SE_PATH="" \n'
1303 <        txt += 'fi \n'
1304 <        txt += 'echo "SE = $SE"\n'
1305 <        txt += 'echo "SE_PATH = $SE_PATH"\n'
1298 >            txt += 'if [ -z "$SE" ]; then\n'
1299 >            txt += '    SE="" \n'
1300 >            txt += 'fi \n'
1301 >            txt += 'if [ -z "$SE_PATH" ]; then\n'
1302 >            txt += '    SE_PATH="" \n'
1303 >            txt += 'fi \n'
1304 >            txt += 'echo "SE = $SE"\n'
1305 >            txt += 'echo "SE_PATH = $SE_PATH"\n'
1306  
1372 –        if (publish_data == 1):  
1373 –            #processedDataset = self.cfg_params['USER.processed_datasetname']
1307              processedDataset = self.cfg_params['USER.publish_data_name']
1308              txt += 'ProcessedDataset='+processedDataset+'\n'
1309              #### LFN=/store/user/<user>/processedDataset_PSETHASH
1310              txt += 'if [ "$SE_PATH" == "" ]; then\n'
1311              #### FEDE: added slash in LFN ##############
1312              txt += '    FOR_LFN=/copy_problems/ \n'
1313 <            txt += 'else \n'
1313 >            txt += 'else \n'
1314              txt += '    tmp=`echo $SE_PATH | awk -F \'store\' \'{print$2}\'` \n'
1315              #####  FEDE TO BE CHANGED, BECAUSE STORE IS HARDCODED!!!! ########
1316              txt += '    FOR_LFN=/store$tmp \n'
1317 <            txt += 'fi \n'
1317 >            txt += 'fi \n'
1318              txt += 'echo "ProcessedDataset = $ProcessedDataset"\n'
1319              txt += 'echo "FOR_LFN = $FOR_LFN" \n'
1320              txt += 'echo "CMSSW_VERSION = $CMSSW_VERSION"\n\n'
1321 <            #txt += 'echo "$RUNTIME_AREA/'+self.version+'/ProdAgentApi/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH"\n'
1322 <            txt += 'echo "$SOFTWARE_DIR/ProdAgentApi/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH"\n'
1323 <            txt += '$SOFTWARE_DIR/ProdAgentApi/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH\n'
1391 <            #txt += '$RUNTIME_AREA/'+self.version+'/ProdAgentApi/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH\n'
1392 <      
1321 >            txt += 'echo "$SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH"\n'
1322 >            txt += '$SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH\n'
1323 >
1324              txt += 'modifyReport_result=$?\n'
1325              txt += 'echo modifyReport_result = $modifyReport_result\n'
1326              txt += 'if [ $modifyReport_result -ne 0 ]; then\n'
# Line 1399 | Line 1330 | class Cmssw(JobType):
1330              txt += '    mv NewFrameworkJobReport.xml crab_fjr_$NJob.xml\n'
1331              txt += 'fi\n'
1332          else:
1333 <            txt += 'ProcessedDataset=no_data_to_publish \n'
1403 <            #### FEDE: added slash in LFN ##############
1404 <            txt += 'FOR_LFN=/local/ \n'
1405 <            txt += 'echo "ProcessedDataset = $ProcessedDataset"\n'
1406 <            txt += 'echo "FOR_LFN = $FOR_LFN" \n'
1333 >            txt += 'echo "no data publication required"\n'
1334          return txt
1335  
1336      def cleanEnv(self):
1337 <        ### OLI_DANIELE
1338 <        txt = ''
1412 <        txt += 'if [ $middleware == OSG ]; then\n'  
1337 >        txt = ''
1338 >        txt += 'if [ $middleware == OSG ]; then\n'
1339          txt += '    cd $RUNTIME_AREA\n'
1340 <        txt += '    echo "Remove working directory: $WORKING_DIR"\n'
1340 >        txt += '    echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n'
1341 >        txt += '    echo ">>> Remove working directory: $WORKING_DIR"\n'
1342          txt += '    /bin/rm -rf $WORKING_DIR\n'
1343          txt += '    if [ -d $WORKING_DIR ] ;then\n'
1344 <        txt += '              echo "SET_EXE 60999 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after cleanup of WN"\n'
1345 <        txt += '              echo "JOB_EXIT_STATUS = 60999"\n'
1346 <        txt += '              echo "JobExitCode=60999" | tee -a $RUNTIME_AREA/$repo\n'
1347 <        txt += '              dumpStatus $RUNTIME_AREA/$repo\n'
1421 <        txt += '        rm -f $RUNTIME_AREA/$repo \n'
1422 <        txt += '        echo "MonitorJobID=`echo $MonitorJobID`" | tee -a $RUNTIME_AREA/$repo \n'
1423 <        txt += '        echo "MonitorID=`echo $MonitorID`" | tee -a $RUNTIME_AREA/$repo\n'
1344 >        txt += '        echo "SET_EXE 60999 ==> OSG $WORKING_DIR could not be deleted on WN `hostname` after cleanup of WN"\n'
1345 >        txt += '        echo "JOB_EXIT_STATUS = 60999"\n'
1346 >        txt += '        echo "JobExitCode=60999" | tee -a $RUNTIME_AREA/$repo\n'
1347 >        txt += '        dumpStatus $RUNTIME_AREA/$repo\n'
1348          txt += '    fi\n'
1349          txt += 'fi\n'
1350          txt += '\n'
# Line 1432 | Line 1356 | class Cmssw(JobType):
1356      def getParams(self):
1357          return self._params
1358  
1435 –    def setTaskid_(self):
1436 –        self._taskId = self.cfg_params['taskId']
1437 –        
1438 –    def getTaskid(self):
1439 –        return self._taskId
1440 –
1359      def uniquelist(self, old):
1360          """
1361          remove duplicates from a list
# Line 1446 | Line 1364 | class Cmssw(JobType):
1364          for e in old:
1365              nd[e]=0
1366          return nd.keys()
1367 +
1368 +
1369 +    def checkOut(self, limit):
1370 +        """
1371 +        check the dimension of the output files
1372 +        """
1373 +        txt = 'echo ">>> Starting output sandbox limit check :"\n'
1374 +        listOutFiles = []
1375 +        txt += 'stdoutFile=`ls *stdout` \n'
1376 +        txt += 'stderrFile=`ls *stderr` \n'
1377 +        if (self.return_data == 1):
1378 +            for file in (self.output_file+self.output_file_sandbox):
1379 +                listOutFiles.append(self.numberFile_(file, '$NJob'))
1380 +            listOutFiles.append('$stdoutFile')
1381 +            listOutFiles.append('$stderrFile')
1382 +        else:
1383 +            for file in (self.output_file_sandbox):
1384 +                listOutFiles.append(self.numberFile_(file, '$NJob'))
1385 +            listOutFiles.append('$stdoutFile')
1386 +            listOutFiles.append('$stderrFile')
1387 +  
1388 +        txt += 'echo "OUTPUT files: '+string.join(listOutFiles,' ')+'"\n'
1389 +        txt += 'filesToCheck="'+string.join(listOutFiles,' ')+'"\n'
1390 +       # txt += 'echo "OUTPUT files: '+str(allOutFiles)+'";\n'
1391 +        txt += 'ls -gGhrta;\n'
1392 +        txt += 'sum=0;\n'
1393 +        txt += 'for file in $filesToCheck ; do\n'
1394 +        txt += '    if [ -e $file ]; then\n'
1395 +        txt += '        tt=`ls -gGrta $file | awk \'{ print $3 }\'`\n'
1396 +        txt += '        sum=`expr $sum + $tt`\n'
1397 +        txt += '    else\n'
1398 +        txt += '        echo "WARNING: output file $file not found!"\n'
1399 +        txt += '    fi\n'
1400 +        txt += 'done\n'
1401 +        txt += 'echo "Total Output dimension: $sum";\n'
1402 +        txt += 'limit='+str(limit)+';\n'
1403 +        txt += 'echo "OUTPUT FILES LIMIT SET TO: $limit";\n'
1404 +        txt += 'if [ $limit -lt $sum ]; then\n'
1405 +        txt += '    echo "WARNING: output files have to big size - something will be lost;"\n'
1406 +        txt += '    echo "         checking the output file sizes..."\n'
1407 +        txt += '    tot=0;\n'
1408 +        txt += '    for filefile in $filesToCheck ; do\n'
1409 +        txt += '        dimFile=`ls -gGrta $filefile | awk \'{ print $3 }\';`\n'
1410 +        txt += '        tot=`expr $tot + $tt`;\n'
1411 +        txt += '        if [ $limit -lt $dimFile ]; then\n'
1412 +        txt += '            echo "deleting file: $filefile";\n'
1413 +        txt += '            rm -f $filefile\n'
1414 +        txt += '        elif [ $limit -lt $tot ]; then\n'
1415 +        txt += '            echo "deleting file: $filefile";\n'
1416 +        txt += '            rm -f $filefile\n'
1417 +        txt += '        else\n'
1418 +        txt += '            echo "saving file: $filefile"\n'
1419 +        txt += '        fi\n'
1420 +        txt += '    done\n'
1421 +
1422 +        txt += '    ls -agGhrt;\n'
1423 +        txt += '    echo "WARNING: output files are too big in dimension: can not put in the output_sandbox.";\n'
1424 +        txt += '    echo "JOB_EXIT_STATUS = 70000";\n'
1425 +        txt += '    exit_status=70000;\n'
1426 +        txt += 'else'
1427 +        txt += '    echo "Total Output dimension $sum is fine.";\n'
1428 +        txt += 'fi\n'
1429 +        txt += 'echo "Ending output sandbox limit check"\n'
1430 +        return txt

Diff Legend

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