add logfile, max_separation_arcmin

steps/find_skymodel_cal.cwl

@@ -15,11 +15,7 @@ inputs:
       type:
         - Directory?
         - File?
-<<<<<<< HEAD
-      doc: Directory containing the sky models
-=======
       doc: Directory or file containing the sky models
->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276
     - id: skymodels_extension
       type: string?
       doc: path extension of the sky models
@@ -80,13 +76,15 @@ outputs:
         loadContents: true
         glob: 'out.json'
         outputEval: $(JSON.parse(self[0].contents).skymodel_name)
+  - id: logfile
+    type: File?
+    outputBinding:
+      glob: find_skymodel_cal.log    
+        
 requirements:
   - class: InlineJavascriptRequirement
 
 hints:
   DockerRequirement:
-<<<<<<< HEAD
-    dockerPull: lofareosc/prefactor:master
-=======
     dockerPull: lofareosc/prefactor:HBAcalibrator
->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276
+stdout: find_skymodel_cal.log
\ No newline at end of file

workflows/prefactor_calibrator.cwl

@@ -264,6 +264,8 @@ steps:
           - demix_sources
       - id: do_smooth
         source: do_smooth
+      - id: max_separation_arcmin
+        source: max_separation_arcmin
       - id: min_separation
         source: min_separation
       - id: A-Team_skymodel

workflows/prefactor_calibrator/prep.cwl

@@ -129,6 +129,12 @@ outputs:
     type: 'File[]'
     'sbg:x': 1000
     'sbg:y': 200
+  - id: find_skymodel_cal.log
+    outputSource:
+      - find_skymodel_cal/logfile
+    type: 'File[]?'
+    'sbg:x': 1000
+    'sbg:y': 300
 steps:
   - id: ndppp_prep_cal
     in:
@@ -222,8 +228,11 @@ steps:
         source: msin
       - id: skymodels
         source: calibrator_path_skymodel
+      - id: max_separation_arcmin
+        source: max_separation_arcmin
     out:
       - id: output_models
+      - id: logfile
     run: ../../steps/find_skymodel_cal.cwl
     label: find_skymodel_cal
     'sbg:x': -500