Rename _ECHO_Disk to ''

Author: dabercro

CMSToolBox/workflowinfo.py

@@ -350,9 +350,9 @@ def site_to_run(self, task):
         all_site_list = site_list()
 
         for site in site_set:
-            clean_site = re.sub(r'_(Disk|MSS)$', '', site)
+            clean_site = re.sub(r'_(ECHO_)?(Disk|MSS)$', '', site)
             if clean_site not in out_list and clean_site and \
-                    re.sub(r'_(ECHO)', '', clean_site) in all_site_list:
+                    clean_site in all_site_list:
                 out_list.append(clean_site)
 
         out_list.sort()