Removing minor errors in NPZ routines

pythonScripts/generateNPZ.py

@@ -6,7 +6,8 @@ import SimpleITK
 import datetime
 
 def initDB(site,returnFB=False):
-    home=os.path.expanduser('~'),
+    home=os.path.expanduser('~')
+    print(home)
     nixSuite=os.path.join(home,'software','src','nixSuite')
     sys.path.append(os.path.join(nixSuite,'wrapper'))
     import nixWrapper
@@ -20,12 +21,12 @@ def initDB(site,returnFB=False):
     net.getCSRF()
     if not returnFB:
         return labkeyDatabaseBrowser.labkeyDB(net)
-    return labkeyDatabaseBrowser.labkeyDB(net),
+    return labkeyDatabaseBrowser.labkeyDB(net),\
         labkeyFileBrowser.labkeyFileBrowser(net)
 
 def initOrthanc(site,returnFB=False):
 
-    home=os.path.expanduser('~'),
+    home=os.path.expanduser('~')
     nixSuite=os.path.join(home,'software','src','nixSuite')
     sys.path.append(os.path.join(nixSuite,'wrapper'))
     import nixWrapper
@@ -38,7 +39,7 @@ def initOrthanc(site,returnFB=False):
     net.init(fconfig)
     if not returnFB:
         return orthancDatabaseBrowser.orthancDB(net)
-    return orthancDatabaseBrowser.orthancDB(net),
+    return orthancDatabaseBrowser.orthancDB(net),\
         orthancFileBrowser.orthancFileBrowser(net)
 
 def parsePos(x):
@@ -111,7 +112,6 @@ def getFile(db,odb,project,outdir,n1=0,n2=1):
             code='{:16x}'.format(random.randrange(16**16))
             r['pseudoCode']=code
             doUpdate=True
-        codes.append(code)
         fname=os.path.join(outdir,f'{code}.npz')
         arr={}
         #debug  don't load array

pythonScripts/parseNPZ.py

@@ -1,5 +1,6 @@
 import SimpleITK
 import numpy
+import os
 
 def convertToITK(dt,label):
     #convert to SimpleITKimage to display it
@@ -22,8 +23,8 @@ def generateNiftyFromNPZ(infile):
     outdir=os.path.dirname(infile)
     baseName=os.path.basename(infile).replace('.npz','')
     dt=numpy.load(infile)
-    ct=parseNPZ.convertToITK(dt,'CT')
-    pet=parseNPZ.convertToITK(dt,'PET')
+    ct=convertToITK(dt,'CT')
+    pet=convertToITK(dt,'PET')
     SimpleITK.WriteImage(ct,os.path.join(outdir,f'{baseName}_CT.nii.gz'))
     SimpleITK.WriteImage(pet,os.path.join(outdir,f'{baseName}_PET.nii.gz'))
     del pet