Clearing merge conflicts

pythonScripts/workflow.py

@@ -7,6 +7,8 @@ import segmentation
 import plotData
 import os
 import datetime
+import sys
+import json
 
 def getRows(setup,returnFB=False):
     qFilter=config.getFilter(setup)
@@ -254,7 +256,7 @@ def workflow(r,setup,stage,fb=None,db=None):
     setC=True
     qLambda=getRobust(setup,'qLambda')
     qLambdaC=getRobust(setup,'qLambdaC')
-                                   
+    print('Running {} for {}'.format(stage,config.getCode(r,setup)))                           
     if stage=='setCenters':
         names=listRequiredFiles(stage,r,setup,db=db)
         if fb: