[cig-commits] r11761 - in seismo/3D/automeasure: scripts user_files/socal_3D

[carltape at geodynamics.org]

Author: carltape
Date: 2008-04-07 13:10:39 -0700 (Mon, 07 Apr 2008)
New Revision: 11761

Modified:
   seismo/3D/automeasure/scripts/pick_all_windows.pl
   seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T02
   seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T06
Log:
Very important fix to run script pick_all_windows.pl, which now copies the user_functions.f90 and PAR_FILE into the local directory.  Before, the user had to remember to copy their own files into the local directory prior to running.  The change to TSHIFT_BASE in the socal PAR_FILE will have no effect on the results, since the user_functions.f90 formulas over-ride the default value.


Modified: seismo/3D/automeasure/scripts/pick_all_windows.pl
===================================================================
--- seismo/3D/automeasure/scripts/pick_all_windows.pl	2008-04-07 19:08:07 UTC (rev 11760)
+++ seismo/3D/automeasure/scripts/pick_all_windows.pl	2008-04-07 20:10:39 UTC (rev 11761)
@@ -99,6 +99,9 @@
 # scripts for preparing data and synthetics
 $dir_prepare = "${dir_scripts}/prepare_scripts/${sdataset}";
 
+# scripts for user files
+$dir_user = "${dir_win_code}/user_files";
+
 #$odir         = "/home/carltape/UTILS/test";
 #$odir         = "/net/sierra/raid1/carltape/results/WINDOWS/model_pre_m0";
 $odir         = "/net/sierra/raid1/carltape/results/WINDOWS/model_m0";
@@ -172,6 +175,23 @@
 $par_file = "${dir_win_code}/PAR_FILE";
 $userfun_file = "${dir_win_code}/user_functions.f90";
 
+# copy PAR_FILE into local directory
+# directories for data and synthetics
+if($idataset == 1) {
+   $par_file_in = "${dir_user}/socal_3D/PAR_FILE_T${sTmin}";
+   $userfun_file_in = "${dir_user}/socal_3D/user_functions.f90";
+
+} elsif ($idataset == 2) {
+   $par_file_in = "${dir_user}/japan_3D/PAR_FILE_T${sTmin}";
+   $userfun_file_in = "${dir_user}/japan_3D/user_functions.f90";
+}
+if (not -f ${par_file_in}) {die("check if PAR_FILE ${par_file_in} exist or not\n")}
+if (not -f ${userfun_file_in}) {die("check if PAR_FILE ${userfun_file_in} exist or not\n")}
+
+# copy user files to code directory
+`cp $par_file_in $par_file`;
+`cp $userfun_file_in $userfun_file`;
+
 # name of executable windowing code (in $dir_win_code)
 $win_execute = "test2";
 

Modified: seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T02
===================================================================
--- seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T02	2008-04-07 19:08:07 UTC (rev 11760)
+++ seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T02	2008-04-07 20:10:39 UTC (rev 11761)
@@ -29,7 +29,7 @@
 
 # -------------------------------------------------------------
 # TSHIFT
-TSHIFT_BASE                     = 5.0
+TSHIFT_BASE                     = 4.0
 
 # -------------------------------------------------------------
 # limit on CC for window acceptance

Modified: seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T06
===================================================================
--- seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T06	2008-04-07 19:08:07 UTC (rev 11760)
+++ seismo/3D/automeasure/user_files/socal_3D/PAR_FILE_T06	2008-04-07 20:10:39 UTC (rev 11761)
@@ -29,7 +29,7 @@
 
 # -------------------------------------------------------------
 # TSHIFT
-TSHIFT_BASE                     = 3.0
+TSHIFT_BASE                     = 12.0
 
 # -------------------------------------------------------------
 # limit on CC for window acceptance