Changeset 41598

Timestamp:

May 18, 2021, 3:31:23 PM (5 years ago)

Author:

eugene

Message:

disable updatesummitexp (never fully coded); fix optimized build issues

Location:

trunk

Files:

• Ohana/src/kapa2/src/bDrawObjects.c (modified) (1 diff)
• Ohana/src/relphot/src/ZeroPointModes.c (modified) (1 diff)
• ippTools/src/pztool.c (modified) (5 diffs)
• ippTools/src/pztoolConfig.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/bDrawObjects.c

@@ -211 +211 @@
 
   int scaleColor = (object[0].color < 0);
-  unsigned char *pixel1, *pixel2, *pixel3;
+  unsigned char *pixel1 = NULL, *pixel2 = NULL, *pixel3 = NULL;
   float *z = object[0].z;
 

trunk/Ohana/src/relphot/src/ZeroPointModes.c

@@ -8 +8 @@
     int newValue;
     fprintf (stdout, "Set Iteration (current = %d): ", CurrentLoop);
-    fscanf (stdin, "%d", &newValue);
+    if (!fscanf (stdin, "%d", &newValue)) return;
     fprintf (stdout, "Using iteration %d\n", newValue);
     CurrentLoop = newValue;

trunk/ippTools/src/pztool.c

@@ -49 +49 @@
 static bool updatepzexpMode(pxConfig *config);
 static bool updatenewexpMode(pxConfig *config);
-static bool updatesummitExpMode(pxConfig *config);
+
+// XXX EAM : 2021.05.18 : code for updatesummitExp was added but not finished.
+// XXX static bool updatesummitExpMode(pxConfig *config);
 
 // static bool copydoneCompleteExp(pxConfig *config);
@@ -55 +57 @@
 static psArray *pzArrayZip(psArray *arraySet, psS64 limit);
 static bool pzDownloadExpSetState(pxConfig *config, const psS64 summit_id, const char *state);
-static bool summitExpSetFault(pxConfig *config, const psS64 summit_id, const int fault);
+
+// XXX static bool summitExpSetFault(pxConfig *config, const psS64 summit_id, const int fault);
 
 # define MODECASE(caseName, func) \
@@ -90 +93 @@
         MODECASE(PZTOOL_MODE_UPDATEPZEXP, updatepzexpMode);
         MODECASE(PZTOOL_MODE_UPDATENEWEXP, updatenewexpMode);
-        MODECASE(PZTOOL_MODE_UPDATESUMMITEXP, updatesummitExpMode);
+        // XXX MODECASE(PZTOOL_MODE_UPDATESUMMITEXP, updatesummitExpMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -936 +939 @@
 }
 
+# if (0)
 static bool summitExpSetFault(pxConfig *config, const psS64 summit_id, const int fault)
 {
@@ -968 +972 @@
   return true;
 }
-  
+# endif  
   
 static bool updatepzexpMode(pxConfig *config)

trunk/ippTools/src/pztoolConfig.c

@@ -171 +171 @@
     psMetadataAddStr(updatepzexpArgs, PS_LIST_TAIL, "-set_state",  0,            "define new state (required)", NULL);
     
+# if (0)
     // -updatesummitexp
     psMetadata *updatesummitexpArgs = psMetadataAlloc();
@@ -178 +179 @@
     psMetadataAddStr(updatesummitexpArgs, PS_LIST_TAIL, "-telescope",  0,            "search by telescope (required)", NULL);
     psMetadataAddS32(updatesummitexpArgs, PS_LIST_TAIL, "-set_fault",  0,            "define new fault (required)", 0);
+# endif
     
     // -updatenewexp