Updating analysis.py to work with modified version of segmentation.py

pythonScripts/analysis.py

@@ -143,7 +143,7 @@ def doPixelAnalysisRow(db,r,setup, mode='IVF'):
    for s2 in sigma2:
       f=config.getPixelFitParFinalName(code,nc,s2,mode)
       fName=getData.getLocalPath(r,setup,f)
-      sFile=segmentation.getSegmentationFileName(db,r,setup)
+      sFile=segmentation.getSegmentationFileName(r,setup,db=db)
       segmFile=getData.getLocalPath(r,setup,sFile)
       if os.path.isfile(fName):
          print('Skipping; {} available.'.format(fName))

pythonScripts/segmentation.py

@@ -134,8 +134,9 @@ def updateSegmentation(db,setup,r,pixels):
       db.modifyRows(mode,setup['project'],'study','Segmentation',[entry])
    print('Done')
     
-def getSegmentationFileName(r,setup):
-   db,fb=getData.connectDB(setup['network'])
+def getSegmentationFileName(r,setup,db=None):
+   if not db:
+      db,fb=getData.connectDB(setup['network'])
    if setup['segmentationMode']=='TXT':
       return '{}_Segmentation.txt'.format(config.getCode(r,setup))
    if setup['segmentationMode']=='NRRD':