Skip to content
Snippets Groups Projects
Commit 1d4623b6 authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #10695: Renamed functions that were equal to type names

parent cd95c58e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py
+ 54
− 54
View file @ 1d4623b6
...@@ -93,31 +93,31 @@ class RATaskSpecified(OTDBBusListener): ...@@ -93,31 +93,31 @@ class RATaskSpecified(OTDBBusListener):
subset[key] = conversion(parset, prefix + key) subset[key] = conversion(parset, prefix + key)
""" Some conversion functions for common parameter-value types.""" """ Some conversion functions for common parameter-value types."""
def strvector(parset, key): def as_strvector(parset, key):
return parset.getStringVector(key, True) return parset.getStringVector(key, True)
def intvector(parset, key): def as_intvector(parset, key):
return parset.getIntVector(key, True) return parset.getIntVector(key, True)
def bool(parset, key): def as_bool(parset, key):
return parset.getBool(key) return parset.getBool(key)
def int(parset, key): def as_int(parset, key):
return parset.getInt(key) return parset.getInt(key)
def float(parset, key): def as_float(parset, key):
return parset.getDouble(key) return parset.getDouble(key)
# ===================================== # =====================================
# Parset meta info # Parset meta info
# ===================================== # =====================================
add("Version.number", int, prefix="") add("Version.number", as_int, prefix="")
# ===================================== # =====================================
# Maintenance/reservation settings # Maintenance/reservation settings
# ===================================== # =====================================
if radb_type in ["maintenance","reservation"]: if radb_type in ["maintenance","reservation"]:
add("Observation.VirtualInstrument.stationList", strvector) add("Observation.VirtualInstrument.stationList", as_strvector)
add("Observation.startTime") add("Observation.startTime")
add("Observation.stopTime") add("Observation.stopTime")
...@@ -126,100 +126,100 @@ class RATaskSpecified(OTDBBusListener): ...@@ -126,100 +126,100 @@ class RATaskSpecified(OTDBBusListener):
# ===================================== # =====================================
if radb_type == "observation": if radb_type == "observation":
add("Observation.momID") add("Observation.momID")
add("Observation.sampleClock", int) add("Observation.sampleClock", as_int)
add("Observation.nrBitsPerSample", int) add("Observation.nrBitsPerSample", as_int)
add("Observation.antennaSet") add("Observation.antennaSet")
add("Observation.VirtualInstrument.stationList", strvector) add("Observation.VirtualInstrument.stationList", as_strvector)
add("Observation.startTime") add("Observation.startTime")
add("Observation.stopTime") add("Observation.stopTime")
add("Observation.nrBeams", int) add("Observation.nrBeams", as_int)
nrSAPs = subset.get("Observation.nrBeams", 0) nrSAPs = subset.get("Observation.nrBeams", 0)
for sap in xrange(0, nrSAPs): for sap in xrange(0, nrSAPs):
add("Observation.Beam[%d].subbandList" % (sap,), intvector) add("Observation.Beam[%d].subbandList" % (sap,), as_intvector)
# ===================================== # =====================================
# Correlator settings # Correlator settings
# ===================================== # =====================================
add("Observation.DataProducts.Output_Correlated.enabled", bool) add("Observation.DataProducts.Output_Correlated.enabled", as_bool)
add("Observation.DataProducts.Output_Correlated.storageClusterName") add("Observation.DataProducts.Output_Correlated.storageClusterName")
add("Observation.DataProducts.Output_Correlated.identifications", strvector) add("Observation.DataProducts.Output_Correlated.identifications", as_strvector)
add("Observation.ObservationControl.OnlineControl.Cobalt.Correlator.integrationTime", float) add("Observation.ObservationControl.OnlineControl.Cobalt.Correlator.integrationTime", as_float)
add("Observation.ObservationControl.OnlineControl.Cobalt.Correlator.nrChannelsPerSubband", int) add("Observation.ObservationControl.OnlineControl.Cobalt.Correlator.nrChannelsPerSubband", as_int)
# ===================================== # =====================================
# Beamformer settings # Beamformer settings
# ===================================== # =====================================
add("Observation.DataProducts.Output_IncoherentStokes.enabled", bool) add("Observation.DataProducts.Output_IncoherentStokes.enabled", as_bool)
add("Observation.DataProducts.Output_IncoherentStokes.storageClusterName") add("Observation.DataProducts.Output_IncoherentStokes.storageClusterName")
add("Observation.DataProducts.Output_IncoherentStokes.identifications", strvector) add("Observation.DataProducts.Output_IncoherentStokes.identifications", as_strvector)
add("Observation.DataProducts.Output_CoherentStokes.enabled", bool) add("Observation.DataProducts.Output_CoherentStokes.enabled", as_bool)
add("Observation.DataProducts.Output_CoherentStokes.storageClusterName") add("Observation.DataProducts.Output_CoherentStokes.storageClusterName")
add("Observation.DataProducts.Output_CoherentStokes.identifications", strvector) add("Observation.DataProducts.Output_CoherentStokes.identifications", as_strvector)
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.flysEye", bool) add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.flysEye", as_bool)
#add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.nrChannelsPerSubband") # only needed to determine Cobalt.blockSize #add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.nrChannelsPerSubband") # only needed to determine Cobalt.blockSize
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.subbandsPerFile", int) add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.subbandsPerFile", as_int)
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.timeIntegrationFactor", int) add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.timeIntegrationFactor", as_int)
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.which") add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.CoherentStokes.which")
#add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.nrChannelsPerSubband") # only needed to determine Cobalt.blockSize #add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.nrChannelsPerSubband") # only needed to determine Cobalt.blockSize
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.subbandsPerFile", int) add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.subbandsPerFile", as_int)
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.timeIntegrationFactor", int) add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.timeIntegrationFactor", as_int)
add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.which") add("Observation.ObservationControl.OnlineControl.Cobalt.BeamFormer.IncoherentStokes.which")
for sap in xrange(0, nrSAPs): for sap in xrange(0, nrSAPs):
add("Observation.Beam[%d].nrTabRings" % (sap,), int) add("Observation.Beam[%d].nrTabRings" % (sap,), as_int)
add("Observation.Beam[%d].nrTiedArrayBeams" % (sap,), int) add("Observation.Beam[%d].nrTiedArrayBeams" % (sap,), as_int)
nrTABs = subset.get("Observation.Beam[%d].nrTiedArrayBeams" % (sap,), 0) nrTABs = subset.get("Observation.Beam[%d].nrTiedArrayBeams" % (sap,), 0)
for tab in xrange(0, nrTABs): for tab in xrange(0, nrTABs):
add("Observation.Beam[%d].TiedArrayBeam[%d].coherent" % (sap,tab), bool) add("Observation.Beam[%d].TiedArrayBeam[%d].coherent" % (sap,tab), as_bool)
# ===================================== # =====================================
# Pipeline settings # Pipeline settings
# ===================================== # =====================================
if radb_type == "pipeline" and radb_subtype in ["averaging pipeline", "calibration pipeline"]: if radb_type == "pipeline" and radb_subtype in ["averaging pipeline", "calibration pipeline"]:
# Calibrator / Averaging pipelines # Calibrator / Averaging pipelines
add("Observation.DataProducts.Output_Correlated.enabled", bool) add("Observation.DataProducts.Output_Correlated.enabled", as_bool)
add("Observation.DataProducts.Output_Correlated.storageClusterName") add("Observation.DataProducts.Output_Correlated.storageClusterName")
add("Observation.DataProducts.Output_Correlated.identifications", strvector) add("Observation.DataProducts.Output_Correlated.identifications", as_strvector)
add("Observation.DataProducts.Output_InstrumentModel.enabled", bool) add("Observation.DataProducts.Output_InstrumentModel.enabled", as_bool)
add("Observation.DataProducts.Output_InstrumentModel.storageClusterName") add("Observation.DataProducts.Output_InstrumentModel.storageClusterName")
add("Observation.DataProducts.Output_InstrumentModel.identifications", strvector) add("Observation.DataProducts.Output_InstrumentModel.identifications", as_strvector)
add("Observation.DataProducts.Input_Correlated.enabled", bool) add("Observation.DataProducts.Input_Correlated.enabled", as_bool)
add("Observation.DataProducts.Input_Correlated.identifications", strvector) add("Observation.DataProducts.Input_Correlated.identifications", as_strvector)
add("Observation.DataProducts.Input_InstrumentModel.enabled", bool) add("Observation.DataProducts.Input_InstrumentModel.enabled", as_bool)
add("Observation.DataProducts.Input_InstrumentModel.identifications", strvector) add("Observation.DataProducts.Input_InstrumentModel.identifications", as_strvector)
add("Observation.ObservationControl.PythonControl.DPPP.demixer.freqstep", int) add("Observation.ObservationControl.PythonControl.DPPP.demixer.freqstep", as_int)
add("Observation.ObservationControl.PythonControl.DPPP.demixer.timestep", int) add("Observation.ObservationControl.PythonControl.DPPP.demixer.timestep", as_int)
if radb_type == "pipeline" and radb_subtype in ["imaging pipeline", "imaging pipelines msss"]: if radb_type == "pipeline" and radb_subtype in ["imaging pipeline", "imaging pipelines msss"]:
# Imaging pipeline # Imaging pipeline
add("Observation.DataProducts.Output_SkyImage.enabled", bool) add("Observation.DataProducts.Output_SkyImage.enabled", as_bool)
add("Observation.DataProducts.Output_SkyImage.storageClusterName") add("Observation.DataProducts.Output_SkyImage.storageClusterName")
add("Observation.DataProducts.Output_SkyImage.identifications", strvector) add("Observation.DataProducts.Output_SkyImage.identifications", as_strvector)
add("Observation.DataProducts.Input_Correlated.enabled", bool) add("Observation.DataProducts.Input_Correlated.enabled", as_bool)
add("Observation.DataProducts.Input_Correlated.identifications", strvector) add("Observation.DataProducts.Input_Correlated.identifications", as_strvector)
add("Observation.ObservationControl.PythonControl.Imaging.slices_per_image") add("Observation.ObservationControl.PythonControl.Imaging.slices_per_image")
add("Observation.ObservationControl.PythonControl.Imaging.subbands_per_image") add("Observation.ObservationControl.PythonControl.Imaging.subbands_per_image")
if radb_type == "pipeline" and radb_subtype == "long baseline pipeline": if radb_type == "pipeline" and radb_subtype == "long baseline pipeline":
# Long-baseline pipeline # Long-baseline pipeline
add("Observation.DataProducts.Output_Correlated.enabled", bool) add("Observation.DataProducts.Output_Correlated.enabled", as_bool)
add("Observation.DataProducts.Output_Correlated.storageClusterName") add("Observation.DataProducts.Output_Correlated.storageClusterName")
add("Observation.DataProducts.Output_Correlated.identifications", strvector) add("Observation.DataProducts.Output_Correlated.identifications", as_strvector)
add("Observation.DataProducts.Input_Correlated.enabled", bool) add("Observation.DataProducts.Input_Correlated.enabled", as_bool)
add("Observation.DataProducts.Input_Correlated.identifications", strvector) add("Observation.DataProducts.Input_Correlated.identifications", as_strvector)
add("Observation.ObservationControl.PythonControl.LongBaseline.subbandgroups_per_ms", int) add("Observation.ObservationControl.PythonControl.LongBaseline.subbandgroups_per_ms", as_int)
add("Observation.ObservationControl.PythonControl.LongBaseline.subbands_per_subbandgroup", int) add("Observation.ObservationControl.PythonControl.LongBaseline.subbands_per_subbandgroup", as_int)
if radb_type == "pipeline" and radb_subtype == "pulsar pipeline": if radb_type == "pipeline" and radb_subtype == "pulsar pipeline":
# Pulsar pipeline # Pulsar pipeline
add("Observation.DataProducts.Output_Pulsar.enabled", bool) add("Observation.DataProducts.Output_Pulsar.enabled", as_bool)
add("Observation.DataProducts.Output_Pulsar.storageClusterName") add("Observation.DataProducts.Output_Pulsar.storageClusterName")
add("Observation.DataProducts.Output_Pulsar.identifications", strvector) add("Observation.DataProducts.Output_Pulsar.identifications", as_strvector)
add("Observation.DataProducts.Input_CoherentStokes.enabled", bool) add("Observation.DataProducts.Input_CoherentStokes.enabled", as_bool)
add("Observation.DataProducts.Input_CoherentStokes.identifications", strvector) add("Observation.DataProducts.Input_CoherentStokes.identifications", as_strvector)
add("Observation.DataProducts.Input_IncoherentStokes.enabled", bool) add("Observation.DataProducts.Input_IncoherentStokes.enabled", as_bool)
add("Observation.DataProducts.Input_IncoherentStokes.identifications", strvector) add("Observation.DataProducts.Input_IncoherentStokes.identifications", as_strvector)
return subset return subset
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment