apply Sharad and Jean-Roch suggestions

Author: amaltaro

Unified/assignor.py

@@ -219,6 +219,7 @@ def rank( wfn ):
         for prim in list(primary):
             set_lfn = getLFNbase( prim )
             ## if they are requested for processing, they should bbe all closed already
+            # FIXME: remove this closeAllBlocks
             closeAllBlocks(url, prim, blocks)
 
         ## should be 2 but for the time-being let's lower it to get things going
@@ -400,6 +401,8 @@ def pick_campaign( assign_parameters, parameters):
                     parameters['EventsPerJob'] = eventsPerJob
                 else:
                     spl = wfh.getSplittings()[0]
+                    # FIXME: decide which of the lines below needs to remain...
+                    eventsPerJobEstimated = spl['events_per_job'] if 'events_per_job' in spl else None
                     eventsPerJobEstimated = spl['avg_events_per_job'] if 'avg_events_per_job' in spl else None
                     if eventsPerJobEstimated and eventsPerJobEstimated > eventsPerJob:
                         #sendEmail("setting lumi splitting for run-dependent MC","%s was assigned with %s lumis/job"%( wfo.name, lumisPerJob))

Unified/injector.py

@@ -222,7 +222,7 @@ def injector(url, options, specific):
     parser = optparse.OptionParser()
     parser.add_option('-i','--invalidate',help="fetch invalidations from mcm",default=False,action='store_true')
     parser.add_option('-w','--wmstatus',help="from which status in req-mgr",default="assignment-approved")
-    parser.add_option('-s','--setstatus',help="What status to set locally",default="considered")
+    parser.add_option('-s','--setstatus',help="What status to set locally",default="staged")
     parser.add_option('-u','--user',help="What user to fetch workflow from",default="pdmvserv")
     parser.add_option('-r','--replace',help="the workflow name that should be used for replacement",default=None)
     parser.add_option('--user_relval',help="The user that can inject workflows for relvals", default=None)