Changing loops in doPixelAnalysis

pythonScripts/doPixelAnalysis.py

@@ -17,6 +17,7 @@ def main(configFile):
    rows=getData.getPatients(db,xsetup,qfilter)
 
    mode=['global','IVF']
+   print('doPixelAnalysis...starting')
    for r in rows:
       segmentation.loadSegmentation(db,fb,r,xsetup)
       getData.downloadCenters(fb,r,xsetup)
@@ -27,15 +28,20 @@ def main(configFile):
    for r in rows:
       code=config.getCode(r,xsetup)
       nc=segmentation.getNC(r,xsetup)
+      files=[]
       for s2 in xsetup['sigma2']:
-         files=config.printPixelFitParFinalRowNames(r,xsetup,nc,s2,pixelFitMode)
-         fullFiles=[getData.getLocalPath(r,xsetup,f) for f in files]
-         filesPresent=[os.path.isfile(f) for f in fullFiles]
-         #check if we need to run analysis
-         if not all(filesPresent):
-            analysis.doPixelAnalysisRow(r,xsetup)
-
-         getData.copyToServer(fb,r,xsetup,files)
+         files.extend(config.printPixelFitParFinalRowNames(r,xsetup,nc,s2,pixelFitMode))
+
+      fullFiles=[getData.getLocalPath(r,xsetup,f) for f in files]
+      print(fullFiles)
+      filesPresent=[os.path.isfile(f) for f in fullFiles]
+      print(filesPresent)
+      #check if we need to run analysis
+      if not all(filesPresent):
+          analysis.doPixelAnalysisRow(db,r,xsetup)
+
+      getData.copyToServer(fb,r,xsetup,files)
+      getData.updateStatus(db,r,xsetup,'doPixelAnalysis')
       #
       #getData.uploadPixelFitParFinal(fb,r,xsetup,pixelFitMode)