Merge pull request #532 from todor-ivanov/feature_disable_NANOAOD

Exclude NANOAOD from Unified output dataplacement for standard workfl…

Author: z4027163

Unified/closor.py

@@ -500,6 +500,9 @@ def close(self):
                         ## make the specific relval rules and the replicas
                         ## figure the destination(s) out
                         destinations = set()
+                        if tier in UC.get("tiers_to_rucio_relval"):
+                            sendLog("Data Tier: %s is blacklisted, so skipping dataset placement for: %s" % (tier,out))
+                            continue
                         if tier != "RECO" and tier != "ALCARECO":
                             destinations.add('T2_CH_CERN')
                         if tier == "GEN-SIM":
@@ -541,6 +544,10 @@ def close(self):
                             to_DDM = True
 
                         ## by typical enabling
+                        if tier in UC.get("tiers_to_rucio_nonrelval"):
+                            sendLog("Data Tier: %s is blacklisted, so skipping dataset placement for: %s" % (tier,out))
+                            continue
+
                         if tier in UC.get("tiers_to_DDM"):
                             to_DDM = True
                         ## check for unitarity

unifiedConfiguration.json

@@ -230,6 +230,14 @@
    "value" : ["AODSIM","MINIAODSIM","GEN-SIM-RAW","GEN-SIM-RECO","GEN-SIM-RECODEBUG","AOD","RECO","MINIAOD","ALCARECO","USER","RAW-RECO","RAWAODSIM","NANOAOD","NANOAODSIM","FEVT","PREMIX"],
    "description": "The data tiers that go to AnaOps"
  },
+ "tiers_to_rucio_relval": {
+   "value" : ["NANOAOD", "NANOAODSIM"],
+   "description": "The data tiers not to be considered for output data placement - RelVal workflows."
+ },
+ "tiers_to_rucio_nonrelval": {
+   "value" : [],
+   "description": "The data tiers not to be considered for output data placement - NonRelVal workflows."
+ },
  "secondary_lock_timeout": {
    "value" : 30,
    "description": "The number of days to keep a secondary input locked"