Fixing compatibility with 3.12 python version

SPS_IW_merged_SingleMulti_bunch_model/SPS_wake_model.py

@@ -68,26 +68,26 @@ while opticflag not in ["0", "1", "2"]:
         print('Invalid input')
 
 
-BPHd = np.genfromtxt('WakeData/WakesBPHforHDTLnewbeta'+opt+'.dat', dtype='f16', delimiter='')
-BPVd = np.genfromtxt('WakeData/WakesBPVforHDTLnewbeta'+opt+'.dat', dtype='f16', delimiter='')
-EFd = np.genfromtxt('WakeData/WakesenamelFlangeforHDTLbeta'+opt+'.dat', dtype='f16', delimiter='')
-RF200d = np.genfromtxt('WakeData/WakesRFcav200forHDTLbeta'+opt+'.dat', dtype='f16', delimiter='')
-RF800d = np.genfromtxt('WakeData/WakesRFcav800forHDTLbeta'+opt+'.dat', dtype='f16', delimiter='')
-walld = np.genfromtxt('WakeData/wall_beta'+opt+'.txt', dtype='f16', delimiter='')
-transitionsd = np.genfromtxt('WakeData/transitionsnew_beta'+opt+'.txt', dtype='f16', delimiter='')
+BPHd = np.genfromtxt('WakeData/WakesBPHforHDTLnewbeta'+opt+'.dat', dtype='float64', delimiter='')
+BPVd = np.genfromtxt('WakeData/WakesBPVforHDTLnewbeta'+opt+'.dat', dtype='float64', delimiter='')
+EFd = np.genfromtxt('WakeData/WakesenamelFlangeforHDTLbeta'+opt+'.dat', dtype='float64', delimiter='')
+RF200d = np.genfromtxt('WakeData/WakesRFcav200forHDTLbeta'+opt+'.dat', dtype='float64', delimiter='')
+RF800d = np.genfromtxt('WakeData/WakesRFcav800forHDTLbeta'+opt+'.dat', dtype='float64', delimiter='')
+walld = np.genfromtxt('WakeData/wall_beta'+opt+'.txt', dtype='float64', delimiter='')
+transitionsd = np.genfromtxt('WakeData/transitionsnew_beta'+opt+'.txt', dtype='float64', delimiter='')
 
-kickerd = np.genfromtxt('WakeData/newkickers_'+optprint+version+'.txt', dtype='f16', delimiter='')  # NEW kicker model 
+kickerd = np.genfromtxt('WakeData/newkickers_'+optprint+version+'.txt', dtype='float64', delimiter='')  # NEW kicker model 
 
 if version == '_PostLS2':
-    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+version+'.txt', dtype='f16', delimiter='')
+    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+version+'.txt', dtype='float64', delimiter='')
     EFd.T[1:] = 0    # EF shielded during LS2
 elif version == '_2018':
-    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+'_PreLS2.txt', dtype='f16', delimiter='')
+    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+'_PreLS2.txt', dtype='float64', delimiter='')
 else:
-    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+'_PreLS2.txt', dtype='f16', delimiter='')
+    ZSd = np.genfromtxt('WakeData/ZS_'+optprint+'_PreLS2.txt', dtype='float64', delimiter='')
     ZSd.T[1:] = 0    # No ZS contribution in legacy model
     # Legacy kicker; comment line below to use new kicker model
-    kickerd = np.genfromtxt('WakeData/kickers'+optprint+'_2015.txt', dtype='f16', delimiter='')
+    kickerd = np.genfromtxt('WakeData/kickers'+optprint+'_2015.txt', dtype='float64', delimiter='')
 
 tvecintp1 = np.arange(1e-2, 10.01, 1e-2)            # Time vector for single bunch simulations (in [ns])
 tvecintp2 = np.arange(1, 1001, 1)            # Time vector for single bunch simulations (in [ns])
@@ -167,7 +167,8 @@ for cnt, datatype in enumerate(data):
                                  + kickerd_int_df[datatype] * a[5] + walld_int_df[datatype] * a[6]
                                  + transitionsd_int_df[datatype] * a[7] + ZSd_int_df[datatype] * a[8])
 
-df_completewake=df_completewake.append(df_completewakezero) # Add zeros for PyHT
+#df_completewake=df_completewake.append(df_completewakezero) # Add zeros for PyHT
+df_completewake=pd.concat([df_completewake, df_completewakezero])
 df_completewake.sort_index(inplace=True)
 #df_completewake.to_hdf('SPS_'+namestr+version+'_'+optprint+'.h5','df') # Save impedance model as DataFrame
 #df_completewake.head()