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

Comparing COMP/CRAB/python/Publisher.py (file contents):
Revision 1.19 by afanfani, Mon Nov 17 13:02:07 2008 UTC vs.
Revision 1.21 by fanzago, Tue Jan 20 11:20:46 2009 UTC

# Line 25 | Line 25 | class Publisher(Actor):
25          """
26  
27          try:
28 <            userprocessedData = cfg_params['USER.publish_data_name']
28 >            self.userprocessedData = cfg_params['USER.publish_data_name']
29              self.processedData = None
30          except KeyError:
31              raise CrabException('Cannot publish output data, because you did not specify USER.publish_data_name parameter in the crab.cfg file')
# Line 143 | Line 143 | class Publisher(Actor):
143              #### for production data
144              self.processedData = dataset['ProcessedDataset']
145              if (dataset['PrimaryDataset'] == 'null'):
146 <                dataset['PrimaryDataset'] = dataset['ProcessedDataset']
147 <            else: # add parentage from input dataset
146 >                #dataset['PrimaryDataset'] = dataset['ProcessedDataset']
147 >                dataset['PrimaryDataset'] = self.userprocessedData
148 >            #else: # add parentage from input dataset
149 >            elif self.datasetpath.upper() != 'NONE':
150                  dataset['ParentDataset']= self.datasetpath
151      
152              dataset['PSetContent']=self.content
# Line 196 | Line 198 | class Publisher(Actor):
198                      # lumi info are now in run hash
199                      file.runs = {}
200                      for ds in file.dataset:
199 –                        ### FEDE FOR NEW LFN ###
200 –                        #ds['ProcessedDataset']=procdataset
201 –                        ########################
201                          ### Fede for production
202                          if (ds['PrimaryDataset'] == 'null'):
203 <                            ds['PrimaryDataset']=procdataset
203 >                            #ds['PrimaryDataset']=procdataset
204 >                            ds['PrimaryDataset']=self.userprocessedData
205                      filestopublish.append(file)
206                  else:
207                      self.noEventsFiles.append(file['LFN'])
# Line 231 | Line 231 | class Publisher(Actor):
231          good_list=[]
232          for fjr in file_list:
233              reports = readJobReport(fjr)
234 <            if reports[0].status == "Success":
235 <               good_list.append(fjr)
234 >            if len(reports)>0:
235 >               if reports[0].status == "Success":
236 >                  good_list.append(fjr)
237          file_list=good_list
238          ##
239          common.logger.debug(6, "file_list = "+str(file_list))

Diff Legend

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