Skip to content
Snippets Groups Projects
Commit f1f2dc9e authored by David Rafferty's avatar David Rafferty
Browse files

Fix defaults for parsets

parent 05bde046
No related branches found
No related tags found
No related merge requests found
...@@ -28,9 +28,8 @@ def run(step, parset, LSM): ...@@ -28,9 +28,8 @@ def run(step, parset, LSM):
skyModel2 = parset.getString('.'.join(["LSMTool.Steps", step, "Skymodel2"]), '' ) skyModel2 = parset.getString('.'.join(["LSMTool.Steps", step, "Skymodel2"]), '' )
matchBy = parset.getString('.'.join(["LSMTool.Steps", step, "MatchBy"]), 'name' ) matchBy = parset.getString('.'.join(["LSMTool.Steps", step, "MatchBy"]), 'name' )
radius = parset.getString('.'.join(["LSMTool.Steps", step, "Radius"]), '0.1' ) radius = parset.getString('.'.join(["LSMTool.Steps", step, "Radius"]), '0.1' )
keep = parset.getString('.'.join(["LSMTool.Steps", step, "KeepMatches"]), 'all' ) keep = parset.getString('.'.join(["LSMTool.Steps", step, "Keep"]), 'all' )
inheritPatches = parset.getBool('.'.join(["LSMTool.Steps", step, "InheritPatches"]), False ) inheritPatches = parset.getBool('.'.join(["LSMTool.Steps", step, "InheritPatches"]), False )
print(skyModel2, matchBy, radius, keep, inheritPatches)
result = concatenate(LSM, skyModel2, matchBy, radius, keep, inheritPatches) result = concatenate(LSM, skyModel2, matchBy, radius, keep, inheritPatches)
......
...@@ -28,7 +28,7 @@ def run(step, parset, LSM): ...@@ -28,7 +28,7 @@ def run(step, parset, LSM):
algorithm = parset.getString('.'.join(["LSMTool.Steps", step, "Algorithm"]), 'single' ) algorithm = parset.getString('.'.join(["LSMTool.Steps", step, "Algorithm"]), 'single' )
root = parset.getString('.'.join(["LSMTool.Steps", step, "Root"]), 'Patch' ) root = parset.getString('.'.join(["LSMTool.Steps", step, "Root"]), 'Patch' )
targetFlux = parset.getString('.'.join(["LSMTool.Steps", step, "TargetFlux"]), '1.0 Jy' ) targetFlux = parset.getString('.'.join(["LSMTool.Steps", step, "TargetFlux"]), '1.0 Jy' )
numClusters = parset.getInt('.'.join(["LSMTool.Steps", step, "NumClusters"]), 10 ) numClusters = parset.getInt('.'.join(["LSMTool.Steps", step, "NumClusters"]), 100 )
applyBeam = parset.getBool('.'.join(["LSMTool.Steps", step, "ApplyBeam"]), False ) applyBeam = parset.getBool('.'.join(["LSMTool.Steps", step, "ApplyBeam"]), False )
result = group(LSM, algorithm, targetFlux, numClusters, applyBeam, root) result = group(LSM, algorithm, targetFlux, numClusters, applyBeam, root)
......
...@@ -27,7 +27,8 @@ def run(step, parset, LSM): ...@@ -27,7 +27,8 @@ def run(step, parset, LSM):
outFile = parset.getString('.'.join(["LSMTool.Steps", step, "OutFile"]), '' ) outFile = parset.getString('.'.join(["LSMTool.Steps", step, "OutFile"]), '' )
patches = parset.getStringVector('.'.join(["LSMTool.Steps", step, "Patches"]), [] ) patches = parset.getStringVector('.'.join(["LSMTool.Steps", step, "Patches"]), [] )
name = parset.getString('.'.join(["LSMTool.Steps", step, "Name"]), '' ) name = parset.getString('.'.join(["LSMTool.Steps", step, "Name"]), '' )
if name == '':
name = None
result = merge(LSM, patches, name) result = merge(LSM, patches, name)
# Write to outFile # Write to outFile
......
...@@ -22,7 +22,7 @@ logging.debug('Loading SETPATCHPOSITIONS module.') ...@@ -22,7 +22,7 @@ logging.debug('Loading SETPATCHPOSITIONS module.')
def run(step, parset, LSM): def run(step, parset, LSM):
method = parset.getString('.'.join(["LSMTool.Steps", step, "Method"]), '' ) method = parset.getString('.'.join(["LSMTool.Steps", step, "Method"]), 'mid' )
applyBeam = parset.getBool('.'.join(["LSMTool.Steps", step, "ApplyBeam"]), False ) applyBeam = parset.getBool('.'.join(["LSMTool.Steps", step, "ApplyBeam"]), False )
outFile = parset.getString('.'.join(["LSMTool.Steps", step, "OutFile"]), '' ) outFile = parset.getString('.'.join(["LSMTool.Steps", step, "OutFile"]), '' )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment