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

Comparing COMP/CRAB/python/DataDiscovery.py (file contents):
Revision 1.37.2.1 by ewv, Thu Jan 21 16:13:28 2010 UTC vs.
Revision 1.44 by ewv, Wed May 26 19:46:12 2010 UTC

# Line 8 | Line 8 | import DBSAPI.dbsApi
8   from DBSAPI.dbsApiException import *
9   import common
10   from crab_util import *
11 + from LumiList import LumiList
12   import os
13  
14  
# Line 88 | Line 89 | class DataDiscovery:
89          #       Attributes
90          self.datasetPath = datasetPath
91          # Analysis dataset is primary/processed/tier/definition
92 <        self.ads = len(self.datasetPath.split("/")) > 4 or len(self.datasetPath.split("/")) == 1
92 >        self.ads = len(self.datasetPath.split("/")) > 4
93          self.cfg_params = cfg_params
94          self.skipBlocks = skipAnBlocks
95  
# Line 101 | Line 102 | class DataDiscovery:
102          self.maxLumis = 0         # DBS output: total number of lumis
103          self.parent = {}          # DBS output: parents of each file
104          self.lumis = {}           # DBS output: lumis in each file
105 <
105 >        self.lumiMask = None
106  
107      def fetchDBSInfo(self):
108          """
# Line 109 | Line 110 | class DataDiscovery:
110          """
111          ## get DBS URL
112          global_url="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
113 <        caf_url = "http://cmsdbsprod.cern.ch/cms_dbs_caf_analysis_01/servlet/DBSServlet"
113 <        dbs_url_map  =   {'glite':    global_url,
114 <                          'glite_slc5':global_url,\
115 <                          'glitecoll':global_url,\
116 <                          'condor':   global_url,\
117 <                          'condor_g': global_url,\
118 <                          'glidein':  global_url,\
119 <                          'lsf':      global_url,\
120 <                          'caf':      caf_url,\
121 <                          'sge':      global_url,\
122 <                          'arc':      global_url,\
123 <                          'pbs':      global_url
124 <                          }
125 <
126 <        dbs_url_default = dbs_url_map[(common.scheduler.name()).lower()]
127 <        dbs_url=  self.cfg_params.get('CMSSW.dbs_url', dbs_url_default)
113 >        dbs_url=  self.cfg_params.get('CMSSW.dbs_url', global_url)
114          common.logger.info("Accessing DBS at: "+dbs_url)
115  
116          ## check if runs are selected
# Line 132 | Line 118 | class DataDiscovery:
118          if (self.cfg_params.has_key('CMSSW.runselection')):
119              runselection = parseRange2(self.cfg_params['CMSSW.runselection'])
120  
121 +        ## check if various lumi parameters are set
122 +        self.lumiMask = self.cfg_params.get('CMSSW.lumi_mask',None)
123 +        self.lumiParams = self.cfg_params.get('CMSSW.total_number_of_lumis',None) or \
124 +                          self.cfg_params.get('CMSSW.lumis_per_job',None)
125 +
126 +        lumiList = None
127 +        if self.lumiMask:
128 +            lumiList = LumiList(filename=self.lumiMask)
129 +        if runselection:
130 +            runList = LumiList(runs = runselection)
131  
132          self.splitByRun = int(self.cfg_params.get('CMSSW.split_by_run', 0))
133  
# Line 140 | Line 136 | class DataDiscovery:
136          args = {}
137          args['url']     = dbs_url
138          args['level']   = 'CRITICAL'
143        args['adshome']   = '$HOME/DBSADS'
139  
140          ## check if has been requested to use the parent info
141          useparent = int(self.cfg_params.get('CMSSW.use_parent',0))
# Line 158 | Line 153 | class DataDiscovery:
153          # parse files and fill arrays
154          for file in self.files :
155              parList  = []
156 <            lumiList = [] # List of tuples
156 >            fileLumis = [] # List of tuples
157              # skip already analyzed blocks
158              fileblock = file['Block']['Name']
159              if fileblock not in anFileBlocks :
# Line 166 | Line 161 | class DataDiscovery:
161                  # asked retry the list of parent for the given child
162                  if useparent==1:
163                      parList = [x['LogicalFileName'] for x in file['ParentList']]
164 <                if self.ads:
165 <                    lumiList = [ (x['RunNumber'], x['LumiSectionNumber'])
164 >                if self.ads or self.lumiMask or self.lumiParams:
165 >                    fileLumis = [ (x['RunNumber'], x['LumiSectionNumber'])
166                                   for x in file['LumiList'] ]
167                  self.parent[filename] = parList
168 <                self.lumis[filename] = lumiList
168 >                # For LumiMask, intersection of two lists.
169 >                if self.lumiMask:
170 >                    self.lumis[filename] = lumiList.filterLumis(fileLumis)
171 >                    if runselection:
172 >                        self.lumis[filename] = runList.filterLumis(self.lumis[filename])
173 >                else:
174 >                    self.lumis[filename] = fileLumis
175                  if filename.find('.dat') < 0 :
176                      events    = file['NumberOfEvents']
177                      # Count number of events and lumis per block
# Line 189 | Line 190 | class DataDiscovery:
190  
191                      # total number of events
192                      self.maxEvents += events
193 <                    self.maxLumis  += len(lumiList)
193 >                    self.maxLumis  += len(self.lumis[filename])
194  
195          if  self.skipBlocks and len(self.eventsPerBlock.keys()) == 0:
196              msg = "No new fileblocks available for dataset: "+str(self.datasetPath)
# Line 210 | Line 211 | class DataDiscovery:
211      def queryDbs(self,api,path=None,runselection=None,useParent=None):
212  
213          allowedRetriveValue = ['retrive_block', 'retrive_run']
214 <        if self.ads: allowedRetriveValue.append('retrive_lumi')
214 >        if self.ads or self.lumiMask or self.lumiParams:
215 >            allowedRetriveValue.append('retrive_lumi')
216          if useParent == 1: allowedRetriveValue.append('retrive_parent')
217          common.logger.debug("Set of input parameters used for DBS query: %s" % allowedRetriveValue)
218          try:
219 <            if len(runselection) <=0 :
220 <                if useParent==1 or self.splitByRun==1 or self.ads:
219 >            if len(runselection) <=0 or self.ads or self.lumiMask:
220 >                if useParent==1 or self.splitByRun==1 or self.ads or self.lumiMask or self.lumiParams:
221                      if self.ads:
222                          files = api.listFiles(analysisDataset=path, retriveList=allowedRetriveValue)
223                      else :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines