Merge pull request #41 from XENONnT/stable_nsdf

Adding SDSC_NSDF_USERDISK
XENONnT · Sep 14, 2023 · d7ac0d1 · d7ac0d1
2 parents 3922131 + cd743b6
commit d7ac0d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.10
+current_version = 1.0.11
 files = setup.py admix/__init__.py
 commit = True
 tag = True
diff --git a/admix/__init__.py b/admix/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """Top-level package for aDMIX."""
-__version__ = '1.0.10'
+__version__ = '1.0.11'
 
 import os
 import logging

diff --git a/admix/config/datamanager.config b/admix/config/datamanager.config
@@ -6,7 +6,7 @@
     "norecords_types": ["lone_hits", "peak_basics", "pulse_counts", "peaklets", "merged_s2s", "peaklet_classification", "peaklet_classification_he", "veto_regions", "pulse_counts_he", "peaklets_he","led_calibration","hitlets_mv","hitlets_nv", "event_basics", "events", "peak_proximity", "peak_positions"],
     "raw_records_types": ["raw_records", "raw_records_he", "raw_records_aqmon", "raw_records_mv", "raw_records_aux_mv", "raw_records_nv", "raw_records_coin_nv", "raw_records_aqmon_nv", "lone_raw_records_nv", "lone_raw_record_statistics_nv"],
     "records_types": ["records","records_he", "records_nv", "records_mv"],
-    "rses": ["LNGS_USERDISK","UC_OSG_USERDISK", "UC_DALI_USERDISK","CNAF_TAPE2_USERDISK","SURFSARA_USERDISK","NIKHEF2_USERDISK","CCIN2P3_USERDISK"],
+    "rses": ["LNGS_USERDISK","UC_OSG_USERDISK","SDSC_NSDF_USERDISK","UC_DALI_USERDISK","CNAF_TAPE2_USERDISK","SURFSARA_USERDISK","NIKHEF2_USERDISK","CCIN2P3_USERDISK"],
     "upload_to": "LNGS_USERDISK",
     "path_rucio_data": "/archive/data/rucio",
     "path_data_to_upload": "/eb",

diff --git a/admix/downloader.py b/admix/downloader.py
@@ -27,14 +27,14 @@ class RucioDownloadError(Exception):
 def determine_rse(rse_list):
     # TODO put this in config or something?
 
-    preferred_host_rses = {'rcc': ['UC_DALI_USERDISK', 'UC_OSG_USERDISK', 'SDSC_USERDISK'],
-                           'sdsc': ['SDSC_USERDISK', 'UC_OSG_USERDISK', 'UC_DALI_USERDISK'],
+    preferred_host_rses = {'rcc': ['UC_DALI_USERDISK', 'UC_OSG_USERDISK', 'SDSC_USERDISK', 'SDSC_NSDF_USERDISK'],
+                           'sdsc': ['SDSC_USERDISK', 'UC_OSG_USERDISK', 'UC_DALI_USERDISK', 'SDSC_NSDF_USERDISK'],
                            'in2p3': ['CCIN2P3_USERDISK', 'NIKHEF2_USERDISK', 'CNAF_USERDISK'],
                            'nikhef': ['NIKHEF2_USERDISK', 'SURFSARA_USERDISK', 'CNAF_USERDISK'],
                            'surf': ['SURFSARA_USERDISK', 'NIKHEF2_USERDISK', 'CNAF_USERDISK'],
                           }
 
-    preferred_glidein_rses = {'US,CA':  ['UC_OSG_USERDISK', 'SDSC_USERDISK', 'UC_DALI_USERDISK'],
+    preferred_glidein_rses = {'US,CA':  ['UC_OSG_USERDISK', 'SDSC_USERDISK', 'UC_DALI_USERDISK', 'SDSC_NSDF_USERDISK'],
                               'EUROPE,NL,IT,FR,IL': ['NIKHEF2_USERDISK', 'CNAF_USERDISK', 'SURFSARA_USERDISK']
                               }
 
@@ -58,7 +58,7 @@ def determine_rse(rse_list):
                         return rse
 
     # as last ditch effort, default to UC_OSG or SDSC
-    for pref_rse in ['UC_OSG_USERDISK', 'SDSC_USERDISK']:
+    for pref_rse in ['UC_OSG_USERDISK', 'SDSC_USERDISK', 'SDSC_NSDF_USERDISK']:
         if pref_rse in rse_list:
             return pref_rse
 

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name='xe-admix',
-    version='1.0.10',
+    version='1.0.11',
     description="advanced Data Management In Xenon (aDMIX)",
     long_description=readme + '\n\n' + history,
     url='https://github.com/XENON1T/admix',