Task #8475: Removed location fixes for CEP4, as pulp does not need them anymore

CEP/Pipeline/recipes/sip/bin/pulsar_pipeline.py

@@ -47,23 +47,12 @@ class pulsar_pipeline(control):
             self.parset.fullModuleName('DataProducts') + '.'
         )
 
-        def fix_locations(locations):
-            """ Hack to turn CEP4:/xxxx paths into valid host:path combinations. """
-
-            def fix(loc):
-              host,path = loc.split(':')
-              if host == "CEP4":
-                  host = "localhost"
-              return "%s:%s" % (host,path)
-
-            return [fix(loc) for loc in locations]
-
         # Coherent Stokes input data
         self.coherentStokesEnabled = dps.getBool('Input_CoherentStokes.enabled', False)
         self.input_data['coherent'] = DataMap([
             tuple(os.path.join(location, filename).split(':')) + (skip,)
                 for location, filename, skip in zip(
-                    fix_locations(dps.getStringVector('Input_CoherentStokes.locations')),
+                    dps.getStringVector('Input_CoherentStokes.locations'),
                     dps.getStringVector('Input_CoherentStokes.filenames'),
                     dps.getBoolVector('Input_CoherentStokes.skip'))
         ])
@@ -74,7 +63,7 @@ class pulsar_pipeline(control):
         self.input_data['incoherent'] = DataMap([
             tuple(os.path.join(location, filename).split(':')) + (skip,)
                 for location, filename, skip in zip(
-                    fix_locations(dps.getStringVector('Input_IncoherentStokes.locations')),
+                    dps.getStringVector('Input_IncoherentStokes.locations'),
                     dps.getStringVector('Input_IncoherentStokes.filenames'),
                     dps.getBoolVector('Input_IncoherentStokes.skip'))
         ])
@@ -83,7 +72,7 @@ class pulsar_pipeline(control):
         self.output_data['data'] = DataMap([
             tuple(os.path.join(location, filename).split(':')) + (skip,)
                 for location, filename, skip in zip(
-                    fix_locations(dps.getStringVector('Output_Pulsar.locations')),
+                    dps.getStringVector('Output_Pulsar.locations'),
                     dps.getStringVector('Output_Pulsar.filenames'),
                     dps.getBoolVector('Output_Pulsar.skip'))
         ])