Fixed from_asd_txt to from_txt everywhere.

geoffrey4444 · Jan 6, 2014 · fb7ba87 · fb7ba87
1 parent 7a68e16
commit fb7ba87
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bin/pycbc_banksim b/bin/pycbc_banksim
@@ -242,7 +242,7 @@ filter_delta_f = 1.0 / float(options.filter_signal_length)
 if options.verbose:
   print("Reading and Interpolating PSD")
 if options.asd_file:
-    psd = pycbc.psd.from_asd_txt(options.asd_file, filter_n,  
+    psd = pycbc.psd.from_txt(options.asd_file, filter_n,  
                            filter_delta_f, options.filter_low_frequency_cutoff)
 elif options.psd:
     psd = pycbc.psd.from_string(options.psd, filter_n, filter_delta_f, 

diff --git a/bin/pycbc_faithsim b/bin/pycbc_faithsim
@@ -169,7 +169,7 @@ print("Reading and Interpolating PSD")
 # Load the asd file
 
 if options.asd_file:
-    psd = pycbc.psd.from_asd_txt(options.asd_file, filter_n,  
+    psd = pycbc.psd.from_txt(options.asd_file, filter_n,  
                            delta_f, options.filter_low_frequency_cutoff)
     psd *= DYN_RANGE_FAC **2
     psd = FrequencySeries(psd,delta_f=psd.delta_f,dtype=float32)

diff --git a/test/bankvetotest.py b/test/bankvetotest.py
@@ -13,7 +13,7 @@
 N = sr * bl
 n = N/2 + 1
 
-psd = pycbc.psd.from_asd_txt("ZERO_DET_high_P.txt", n, df, 14)
+psd = pycbc.psd.from_txt("ZERO_DET_high_P.txt", n, df, 14)
 strain = noise_from_psd(N, dt, psd, seed=0)
 
 htildep, htildec = get_fd_waveform(approximant="TaylorF2", mass1=10, mass2=10, f_lower=15, delta_f=df)

diff --git a/tools/timing/banksim/banksim.py b/tools/timing/banksim/banksim.py
@@ -227,7 +227,7 @@ def outside_mchirp_window(template,signal,w):
 
 print("Reading and Interpolating PSD")
 if options.asd_file:
-    psd = pycbc.psd.from_asd_txt(options.asd_file, filter_n,  
+    psd = pycbc.psd.from_txt(options.asd_file, filter_n,  
                            filter_delta_f, options.filter_low_frequency_cutoff)
 elif options.psd:
     psd = pycbc.psd.from_string(options.psd, filter_n, filter_delta_f,