Update assignProdTaskChain.py

julianbadillo · julianbadillo · commit 1076e41cb401 · 2015-02-25T14:26:52.000+01:00
diff --git a/RelVal/testbed/assignProdTaskChain.py b/RelVal/testbed/assignProdTaskChain.py
@@ -85,70 +85,21 @@ def main():
     parser.add_option('--special', help='Use it for special workflows. You also have to change the code according to the type of WF',dest='special')
     parser.add_option('--test',action="store_true", help='Nothing is injected, only print infomation about workflow and AcqEra',dest='test')
     parser.add_option('--pu',action="store_true", help='Use it to inject PileUp workflows only',dest='pu')
-    parser.add_option('--lsf',action="store_true", help='Use it to assign work to the LSF agent at CERN - vocms174, relvallsf team',dest='lsf')
     (options,args) = parser.parse_args()
 
     if not options.workflow:
         print "The workflow name is mandatory!"
-        print "Usage: python assignRelValWorkflow.py -w <requestName>"
+        print "Usage: python assignProdTaskChain.py -w <requestName>"
         sys.exit(0);
 
     workflow=options.workflow
-    team='mc'
-    site=[
-    "T1_DE_KIT", 
-    "T1_ES_PIC", 
-#    "T1_FR_CCIN2P3", 
-    "T1_IT_CNAF", 
-    "T1_RU_JINR", 
-    "T1_UK_RAL", 
-    "T1_US_FNAL", 
-    "T2_AT_Vienna", 
-#    "T2_BE_IIHE", 
-#    "T2_BE_UCL", 
-#    "T2_BR_SPRACE", 
-    "T2_CH_CERN", 
-#    "T2_CH_CSCS", 
-#    "T2_CN_Beijing", 
-#    "T2_DE_DESY", 
-#    "T2_DE_RWTH", 
-#    "T2_EE_Estonia", 
-#    "T2_ES_CIEMAT", 
-#    "T2_ES_IFCA", 
-#    "T2_FI_HIP", 
-#    "T2_FR_CCIN2P3", 
-#    "T2_FR_GRIF_IRFU", 
-#    "T2_FR_GRIF_LLR", 
-#    "T2_FR_IPHC", 
-    "T2_HU_Budapest", 
-    "T2_IT_Bari", 
-    "T2_IT_Legnaro", 
-    "T2_IT_Pisa", 
-    "T2_IT_Rome", 
-#    "T2_KR_KNU", 
-#    "T2_PL_Warsaw", 
-    "T2_PT_NCG_Lisbon", 
-#    "T2_RU_IHEP", 
-#    "T2_RU_INR", 
-#    "T2_RU_ITEP", 
-#    "T2_RU_JINR", 
-#    "T2_RU_PNPI", 
-#    "T2_RU_SINP", 
-#    "T2_TR_METU", 
-#    "T2_TW_Taiwan", 
-#    "T2_UA_KIPT", 
-#    "T2_UK_London_Brunel", 
-    "T2_UK_London_IC", 
-#    "T2_UK_SGrid_RALPP", 
-    "T2_US_Caltech", 
-    "T2_US_Florida", 
-    "T2_US_MIT", 
-    "T2_US_Nebraska", 
-    "T2_US_Purdue", 
-#    "T2_US_UCSD", 
-#    "T2_US_Vanderbilt", 
-    "T2_US_Wisconsin"
-    ]
+    team='production'
+    site=["T1_DE_KIT","T1_ES_PIC","T1_FR_CCIN2P3","T1_IT_CNAF",
+          "T1_RU_JINR","T1_UK_RAL","T1_US_FNAL","T2_CH_CERN",
+          "T2_DE_DESY","T2_DE_RWTH","T2_ES_CIEMAT","T2_FR_IPHC",
+          "T2_IT_Bari","T2_IT_Legnaro","T2_IT_Pisa","T2_IT_Rome",
+          "T2_UK_London_Brunel","T2_UK_London_IC","T2_US_Caltech","T2_US_MIT",
+          "T2_US_Nebraska","T2_US_Purdue","T2_US_UCSD","T2_US_Wisconsin","T2_US_Florida"]
     procversion=1
     activity='production'
     lfn='/store/mc'
@@ -188,11 +139,6 @@ def main():
     if options.lfn:
         lfn=options.lfn
 
-    # Changing the team name and the site whitelist in case the --lsf parameter was given   
-    if options.lsf:
-        team='relvallsf'
-        site=['T2_CH_CERN']
-
     # If the --test argument was provided, then just print the information gathered so far and abort the assignment
     if options.test:
         print "%s \tAcqEra: %s \tProcStr: %s \tProcVer: %s" % (workflow, acqera, procstring, procversion)
