Changeset 309

Timestamp:

01/25/2011 10:19:02 AM (13 years ago)

Author:

marcus

Message:

r151 | klaus | 2011-01-21 10:02:56 +0100 (Fr, 21 Jan 2011) | 1 line

do not read magnitudes from auto evt files

Location:

SH_SHM/trunk/source/motif

Files:

• cblib3.c (modified) (4 diffs)
• cblib3.h (modified) (2 diffs)
• shm.c (modified) (4 diffs)

SH_SHM/trunk/source/motif/cblib3.c

@@ -2405 +2405 @@
 
 void cl3_restore_from_evt( char evtfile[], CUT_PARAMS *par, long *eventid,
-        TSyStatus *status )
+        TSyBoolean ignore_magnitudes, TSyStatus *status )
 
 /* restores event & phase parameters from evt-file
@@ -2413 +2413 @@
  * CUT_PARAMS *par;           output; params read in
  * long       *eventid;       output; event ID if found in evt file (ptr may be NULL)
+ * TSyBoolean ignore_magnitudes; input; do not read magnitudes from file
  * TSyStatus  *status;        output; return status
  */
@@ -2610 +2611 @@
                 if  (event.period != EvEMPTY_PERIOD)
                         phase.period = event.period;
-                if  (event.mag[EvcMagMl] != EvEMPTY_MAGNITUDE)  {
-                        phase.magnitude = event.mag[EvcMagMl];
-                        phase.magn_source = cPiMagnMl;
-                } /*endif*/
-                if  (event.mag[EvcMagMs] != EvEMPTY_MAGNITUDE)  {
-                        phase.magnitude = event.mag[EvcMagMs];
-                        phase.magn_source = cPiMagnMsPlain;
-                } /*endif*/
-                if  (event.mag[EvcMagMb] != EvEMPTY_MAGNITUDE)  {
-                        phase.magnitude = event.mag[EvcMagMb];
-                        phase.magn_source = cPiMagnMb;
-                } /*endif*/
-                if  (event.mag[EvcMagMw] != EvEMPTY_MAGNITUDE)  {
-                        phase.magnitude = event.mag[EvcMagMw];
-                        phase.magn_source = cPiMagnMw;
-                } /*endif*/
-                if  (event.mag[EvcMagMbb] != EvEMPTY_MAGNITUDE)  {
-                        phase.bb.mbb = event.mag[EvcMagMbb];
-                } /*endif*/
-                if  (event.mag[EvcMagMu] != EvEMPTY_MAGNITUDE)  {
-                        phase.magnitude = event.mag[EvcMagMu];
-                        phase.magn_source = cPiMagnMu;
+                if  (!ignore_magnitudes)  {
+                        if  (event.mag[EvcMagMl] != EvEMPTY_MAGNITUDE)  {
+                                phase.magnitude = event.mag[EvcMagMl];
+                                phase.magn_source = cPiMagnMl;
+                        } /*endif*/
+                        if  (event.mag[EvcMagMs] != EvEMPTY_MAGNITUDE)  {
+                                phase.magnitude = event.mag[EvcMagMs];
+                                phase.magn_source = cPiMagnMsPlain;
+                        } /*endif*/
+                        if  (event.mag[EvcMagMb] != EvEMPTY_MAGNITUDE)  {
+                                phase.magnitude = event.mag[EvcMagMb];
+                                phase.magn_source = cPiMagnMb;
+                        } /*endif*/
+                        if  (event.mag[EvcMagMw] != EvEMPTY_MAGNITUDE)  {
+                                phase.magnitude = event.mag[EvcMagMw];
+                                phase.magn_source = cPiMagnMw;
+                        } /*endif*/
+                        if  (event.mag[EvcMagMbb] != EvEMPTY_MAGNITUDE)  {
+                                phase.bb.mbb = event.mag[EvcMagMbb];
+                        } /*endif*/
+                        if  (event.mag[EvcMagMu] != EvEMPTY_MAGNITUDE)  {
+                                phase.magnitude = event.mag[EvcMagMu];
+                                phase.magn_source = cPiMagnMu;
+                        } /*endif*/
                 } /*endif*/
                 if  (event.ap_source == EvcApSourceDirect)
@@ -3289 +3292 @@
                                 cl3v_extproc[num-1].evtinput );
                 par = parset->par + parset->parno;
-                cl3_restore_from_evt( cl3v_extproc[num-1].evtinput, par, NULL, status );
+                cl3_restore_from_evt( cl3v_extproc[num-1].evtinput, par, NULL, FALSE,
+                        status );
                 if   (SySevere(status))  return;
                 par->soft_change = TRUE;

SH_SHM/trunk/source/motif/cblib3.h

@@ -264 +264 @@
 
 void cl3_restore_from_evt( char evtfile[], CUT_PARAMS *par, long *eventid,
-        STATUS *status );
+        TSyBoolean ignore_magnitudes, STATUS *status );
 
 /* restores event & phase parameters from evt-file
@@ -272 +272 @@
  * CUT_PARAMS *par;           output; params read in
  * long       *eventid;       output; event ID if found, ptr may be NULL
+ * TSyBoolean ignore_magnitudes; input; do not read magnitudes from file
  * STATUS     *status;        output; return status
  */

SH_SHM/trunk/source/motif/shm.c

@@ -3 +3 @@
  *      =====
  *
- * $Revision: 113 $, $Date: 2010-03-05 19:28:01 +0100 (Fr, 05 MÀr 2010) $
+ * $Revision: 151 $, $Date: 2011-01-21 10:02:56 +0100 (Fr, 21 Jan 2011) $
  *
  * main module of shm
@@ -829 +829 @@
                                 printf( "SHM-dbg1: load evt %s\n", autoexec );
                         status = cBcNoError;
-                        cl3_restore_from_evt( autoexec, xmv_cpar, NULL, &status );
+                        cl3_restore_from_evt( autoexec, xmv_cpar, NULL, FALSE, &status );
                         mg_tracedisplay( xmv_w[k_widget_draw], &xmv_dspctrl, &status );
                 } /*endif*/
@@ -1575 +1575 @@
                                 /*cu_delete_all_phases( xmv_w[k_widget_draw],
                                         xmv_w[k_widget_single_draw], "*", TRUE );*/
-                                cl3_restore_from_evt( autoevt, xmv_cpar, &eventid, &status );
+                                cl3_restore_from_evt( autoevt, xmv_cpar, &eventid, TRUE,
+                                        &status );
                                 if  (Severe(&status))  {
                                         cu_alert( status );
@@ -4736 +4737 @@
                 xmv_par.evid = i;
         } else if  (mode == CLC_PATH_EVT)  {
-                cl3_restore_from_evt( selfile, xmv_cpar, &eventid, &status );
+                cl3_restore_from_evt( selfile, xmv_cpar, &eventid, FALSE, &status );
                 if  (GpGetBoolean(cGpB_recover_evid))  xmv_par.evid = eventid;
                 if  (Severe(&status))  {