antspymm 1.3.3__py3-none-any.whl → 1.3.4__py3-none-any.whl

antspymm/mm.py

@@ -1061,6 +1061,27 @@ def nrg_format_path( projectID, subjectID, date, modality, imageID, separator='-
     return os.path.join( thedirectory, thefilename )
 
 
+def get_first_item_as_string(df, column_name):
+    """
+    Check if the first item in the specified column of the DataFrame is a string.
+    If it is not a string, attempt to convert it to an integer and then to a string.
+
+    Parameters:
+    df (pd.DataFrame): The DataFrame to operate on.
+    column_name (str): The name of the column to check.
+
+    Returns:
+    str: The first item in the specified column, guaranteed to be returned as a string.
+    """
+    if isinstance(df[column_name].iloc[0], str):
+        return df[column_name].iloc[0]
+    else:
+        try:
+            return str(int(df[column_name].iloc[0]))
+        except ValueError:
+            raise ValueError("The value cannot be converted to an integer.")
+
+
 def study_dataframe_from_matched_dataframe( matched_dataframe, rootdir, outputdir, verbose=False ):
     """
     converts the output of antspymm.match_modalities dataframe (one row) to that needed for a study-driving dataframe for input to mm_csv
@@ -1078,12 +1099,12 @@ def study_dataframe_from_matched_dataframe( matched_dataframe, rootdir, outputdi
     musthavecols = ['projectID', 'subjectID','date','imageID','filename']
     for k in range(len(musthavecols)):
         if not musthavecols[k] in matched_dataframe.keys():
-            raise ValueError('matched_dataframe is missing column ' +musthavecols[k] + ' in study_dataframe_from_qc_dataframe' )
+            raise ValueError('matched_dataframe is missing column ' + musthavecols[k] + ' in study_dataframe_from_qc_dataframe' )
     csvrow=matched_dataframe.dropna(axis=1)
-    pid=str(csvrow['projectID'].iloc[0] )
-    sid=str(csvrow['subjectID'].iloc[0] )
-    dt=str(csvrow['date'].iloc[0])
-    iid=str(csvrow['imageID'].iloc[0])
+    pid=get_first_item_as_string( csvrow, 'projectID'  )
+    sid=get_first_item_as_string( csvrow, 'subjectID'  ) # str(csvrow['subjectID'].iloc[0] )
+    dt=get_first_item_as_string( csvrow, 'date'  )  # str(csvrow['date'].iloc[0])
+    iid=get_first_item_as_string( csvrow, 'imageID'  ) # str(csvrow['imageID'].iloc[0])
     nrgt1fn=os.path.join( rootdir, pid, sid, dt, 'T1w', iid, str(csvrow['filename'].iloc[0]+iext) )
     if not exists( nrgt1fn ):
         raise ValueError("T1 " + nrgt1fn + " does not exist in study_dataframe_from_qc_dataframe")
@@ -1092,32 +1113,32 @@ def study_dataframe_from_matched_dataframe( matched_dataframe, rootdir, outputdi
     rsfList=[]
     nmList=[]
     if 'flairfn' in csvrow.keys():
-        flid=str(int(csvrow['flairid'].iloc[0]))
+        flid=get_first_item_as_string( csvrow, 'flairid' )
         nrgt2fn=os.path.join( rootdir, pid, sid, dt, 'T2Flair', flid, str(csvrow['flairfn'].iloc[0]+iext) )
         if exists( nrgt2fn ):
             flList.append( nrgt2fn )
     if 'dtfn1' in csvrow.keys():
-        dtid=str(int(csvrow['dtid1'].iloc[0]))
+        dtid=get_first_item_as_string( csvrow, 'dtid1' )
         dtfn1=glob.glob(os.path.join( rootdir, pid, sid, dt, 'DTI*', dtid, str(csvrow['dtfn1'].iloc[0]+iext) ))[0]
         if exists( dtfn1 ):
             dtList.append( dtfn1 )
     if 'dtfn2' in csvrow.keys():
-        dtid=str(int(csvrow['dtid2'].iloc[0]))
+        dtid=get_first_item_as_string( csvrow, 'dtid2' )
         dtfn2=glob.glob(os.path.join(rootdir, pid, sid, dt, 'DTI*', dtid, str(csvrow['dtfn2'].iloc[0]+iext) ))[0]
         if exists( dtfn2 ):
             dtList.append( dtfn2 )
     if 'dtfn3' in csvrow.keys():
-        dtid=str(int(csvrow['dtid3'].iloc[0]))
+        dtid=get_first_item_as_string( csvrow, 'dtid3' )
         dtfn3=glob.glob(os.path.join(rootdir, pid, sid, dt, 'DTI*', dtid, str(csvrow['dtfn3'].iloc[0]+iext) ))[0]
         if exists( dtfn3 ):
             dtList.append( dtfn3 )
     if 'rsffn1' in csvrow.keys():
-        rsid=str(int(csvrow['rsfid1'].iloc[0]))
+        rsid=get_first_item_as_string( csvrow, 'rsfid1' )
         rsfn1=glob.glob(os.path.join( rootdir, pid, sid, dt, 'rsfMRI*', rsid, str(csvrow['rsffn1'].iloc[0]+iext) ))[0]
         if exists( rsfn1 ):
             rsfList.append( rsfn1 )
     if 'rsffn2' in csvrow.keys():
-        rsid=str(int(csvrow['rsfid2'].iloc[0]))
+        rsid=get_first_item_as_string( csvrow, 'rsfid2' )
         rsfn2=glob.glob(os.path.join( rootdir, pid, sid, dt, 'rsfMRI*', rsid, str(csvrow['rsffn2'].iloc[0]+iext) ))[0]
         if exists( rsfn2 ):
             rsfList.append( rsfn2 )
@@ -1125,7 +1146,7 @@ def study_dataframe_from_matched_dataframe( matched_dataframe, rootdir, outputdi
         keyname="nmfn"+str(j)
         keynameid="nmid"+str(j)
         if keyname in csvrow.keys() and keynameid in csvrow.keys():
-            nmid=str(int(csvrow[keynameid].iloc[0]))
+            nmid=get_first_item_as_string( csvrow, keynameid )
             nmsearchpath=os.path.join( rootdir, pid, sid, dt, 'NM2DMT', nmid, "*"+nmid+iext)
             nmfn=glob.glob( nmsearchpath )
             nmfn=nmfn[0]
@@ -10467,6 +10488,7 @@ def brainmap_figure(statistical_df, data_dictionary_path, output_prefix, brain_i
                 print(str(k) +  " " + anattoshow[k]  )
             mysub = zz[zz['anat'].str.contains(anattoshow[k])]
             anatsear=re.sub("dti.fa","",anattoshow[k])
+            anatsear=re.sub("cbf.","",anatsear)
             anatsear=re.sub("t1.volasym","",anatsear)
             anatsear=re.sub("t1.thkasym","",anatsear)
             anatsear=re.sub("t1.areaasym","",anatsear)
@@ -10482,6 +10504,8 @@ def brainmap_figure(statistical_df, data_dictionary_path, output_prefix, brain_i
             anatsear=re.sub("dti.mean.fa.","",anatsear)
             anatsear=re.sub("lravg","",anatsear)
             atlassearch = mydict['tidynames'].str.contains(anatsear)
+            if verbose:
+                print( " anatsear " + anatsear + " atlassearch " )
             if atlassearch.sum() > 0:
                 whichatlas = mydict[atlassearch]['Atlas'].iloc[0]
                 oglabelname = mydict[atlassearch]['Label'].iloc[0]
@@ -10490,13 +10514,13 @@ def brainmap_figure(statistical_df, data_dictionary_path, output_prefix, brain_i
                 oglabelname='unknown'
                 whichatlas=None
             if verbose:
-                print("oglabelname " + oglabelname )
+                print("oglabelname " + oglabelname + " whichatlas " + str(whichatlas) )
             vals2viz = mysub[col2viz].agg(['min', 'max'])
             vals2viz = vals2viz[abs(vals2viz).idxmax()]
             myext = None
-            if 'dktcortex' in anattoshow[k]:
+            if 'dktcortex' in anattoshow[k] or whichatlas == 'desikan-killiany-tourville' or 'dtkregions' in anattoshow[k]:
                 myext = 'dkt_cortex'
-            elif 'cit168' in anattoshow[k]:
+            elif 'cit168' in anattoshow[k] or whichatlas == 'CIT168':
                 myext = 'cit168lab'
             elif 'mtl' in anattoshow[k]:
                 myext = 'mtl'
@@ -10601,9 +10625,17 @@ def brainmap_figure(statistical_df, data_dictionary_path, output_prefix, brain_i
                 print("oglabelname " + oglabelname )
 
             if myext == 'cerebellum':
-                atlasDescript['Description'] = atlasDescript['Description'].str.replace("l_", "")
-                atlasDescript['Description'] = atlasDescript['Description'].str.replace("r_", "")
-                whichindex = atlasDescript.index[atlasDescript['Description'] == oglabelname].values[0]
+                if not atlasDescript.empty and 'Description' in atlasDescript.columns:
+                    atlasDescript['Description'] = atlasDescript['Description'].str.replace("l_", "")
+                    atlasDescript['Description'] = atlasDescript['Description'].str.replace("r_", "")
+                    oglabelname=re.sub("ravg","",oglabelname)
+                    oglabelname=re.sub("lavg","",oglabelname)
+                    whichindex = atlasDescript.index[atlasDescript['Description'] == oglabelname].values[0]
+                else:
+                    if atlasDescript.empty:
+                        print("The DataFrame 'atlasDescript' is empty.")
+                    if 'Description' not in atlasDescript.columns:
+                        print("The column 'Description' does not exist in 'atlasDescript'.")
             else:
                 whichindex = atlasDescript.index[atlasDescript['Description'].str.contains(oglabelname)]
 
@@ -10645,10 +10677,10 @@ def brainmap_figure(statistical_df, data_dictionary_path, output_prefix, brain_i
             if fixed_overlay_range is not None:
                 addemC[0:3,0:3,0:3]=fixed_overlay_range[0]
                 addemC[4:7,4:7,4:7]=fixed_overlay_range[1]
-                addemC[ addemC < fixed_overlay_range[0] ] = fixed_overlay_range[0]
-                addemC[ addemC > fixed_overlay_range[1] ] = fixed_overlay_range[1]
+                addemC[ addemC <= fixed_overlay_range[0] ] = 0 # fixed_overlay_range[0]
+                addemC[ addemC >= fixed_overlay_range[1] ] = fixed_overlay_range[1]
             ants.plot(edgeimgC, addemC, axis=axx, nslices=nslices, ncol=ncol,       
-                overlay_cmap=overlay_cmap, resample=False,
+                overlay_cmap=overlay_cmap, resample=False, overlay_alpha=1.0,
                 filename=figfn, cbar=axx==axes[0], crop=True, black_bg=black_bg )
         if verbose:
             print(f"{col2viz} done")
@@ -10950,10 +10982,10 @@ def aggregate_antspymm_results_sdf(
         myfn = os.path.basename( df['filename'].iloc[x] )
         temp = myfn.split( splitsep )
         # Generalized search paths
-        sid0 = str( temp[0] )
+        sid0 = str( temp[1] )
         sid = str( df[subject_col].iloc[x] )
         if sid0 != sid:
-            warnings.warn("OUTER: the id derived from the filename " + sid + " does not match the id stored in the data frame " + sid )
+            warnings.warn("OUTER: the id derived from the filename " + sid0 + " does not match the id stored in the data frame " + sid )
             warnings.warn( "filename is : " +  myfn )
             warnings.warn( "sid is : " + sid )
             warnings.warn( "x is : " + str(x) )
@@ -11197,8 +11229,11 @@ def mm_match_by_qc_scoring(df_a, df_b, match_column, criteria, prefix='matched_'
         2. A DataFrame containing rows from df_b that were not matched to df_a.
     """
     from scipy.stats import zscore
-    df_a = df_a.loc[:, ~df_a.columns.str.startswith('Unnamed:')]
-    df_b = df_b.loc[:, ~df_b.columns.str.startswith('Unnamed:')].copy()
+    df_a = df_a.loc[:, ~df_a.columns.str.startswith('Unnamed:')].copy()
+    if df_b is not None:
+        df_b = df_b.loc[:, ~df_b.columns.str.startswith('Unnamed:')].copy()
+    else:
+        return df_a, pd.DataFrame()
     
     # Normalize df_b based on criteria
     for col, crit in criteria.items():
@@ -11378,15 +11413,16 @@ def mm_match_by_qc_scoring_all( qc_dataframe, fix_LRRL=True, verbose=True ):
 
     prefixes = ['NM1_', 'NM2_', 'NM3_', 'NM4_', 'NM5_', 'NM6_']  
     undfmod = nmdf  # Initialize 'undfmod' with 'nmdf' for the first iteration
-    if verbose:
-        print('start NM')
-        print( undfmod.shape )
-    for prefix in prefixes:
-        if undfmod.shape[0] > 50:
-            mmdf, undfmod = mm_match_by_qc_scoring(mmdf, undfmod, 'subjectIDdate', criteria, prefix=prefix, exclude_columns=xcl)
-            if verbose:
-                print( prefix )
-                print( undfmod.shape )
+    if undfmod is not None:
+        if verbose:
+            print('start NM')
+            print( undfmod.shape )
+        for prefix in prefixes:
+            if undfmod.shape[0] > 50:
+                mmdf, undfmod = mm_match_by_qc_scoring(mmdf, undfmod, 'subjectIDdate', criteria, prefix=prefix, exclude_columns=xcl)
+                if verbose:
+                    print( prefix )
+                    print( undfmod.shape )
 
     criteria = {'ol_loop': 'min', 'noise': 'min', 'snr': 'max', 'EVR': 'max', 'dimt':'max'}
     # higher bvalues lead to more noise ...

{antspymm-1.3.3.dist-info → antspymm-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: antspymm
-Version: 1.3.3
+Version: 1.3.4
 Summary: multi-channel/time-series medical image processing with antspyx
 Home-page: https://github.com/stnava/ANTsPyMM
 Author: Avants, Gosselin, Tustison, Reardon

antspymm-1.3.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+antspymm/__init__.py,sha256=1fHqufHndrkJwz473av8qOf5-1xm5r-aKHuMAETGIiE,4462
+antspymm/mm.py,sha256=FbboL-Mdg6KTzWvAm770qaKEMLB9wK_isrBmqVbqyQw,478666
+antspymm-1.3.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+antspymm-1.3.4.dist-info/METADATA,sha256=EwUjVut7HWbQQlz-kUaf5qFrfYXXuPXPL5mmeiXdW3A,14590
+antspymm-1.3.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+antspymm-1.3.4.dist-info/top_level.txt,sha256=iyD1sRhCKzfwKRJLq5ZUeV9xsv1cGQl8Ejp6QwXM1Zg,9
+antspymm-1.3.4.dist-info/RECORD,,

antspymm-1.3.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-antspymm/__init__.py,sha256=1fHqufHndrkJwz473av8qOf5-1xm5r-aKHuMAETGIiE,4462
-antspymm/mm.py,sha256=R7W1v2ejIjIc5FZaAVLfyX9De8R5A_W2U-AyHZenxUg,476733
-antspymm-1.3.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-antspymm-1.3.3.dist-info/METADATA,sha256=PJy3nUwSUKIXi62KNJ73RlPBUwL16kX0ZP32gHq3IAg,14590
-antspymm-1.3.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-antspymm-1.3.3.dist-info/top_level.txt,sha256=iyD1sRhCKzfwKRJLq5ZUeV9xsv1cGQl8Ejp6QwXM1Zg,9
-antspymm-1.3.3.dist-info/RECORD,,