Changeset 39767

Timestamp:

Oct 16, 2016, 3:36:53 PM (10 years ago)

Author:

eugene

Message:

minor fixes

Location:

branches/czw_branch/20160809/Ohana/src/relastro/src

Files:

• GetAstromError.c (modified) (2 diffs)
• launch_region_hosts.c (modified) (1 diff)

branches/czw_branch/20160809/Ohana/src/relastro/src/GetAstromError.c

@@ -48 +48 @@
   if (isnan(code[0].astromErrSys)) return NAN;
 
+  if (measure[0].photcode == 1030) {
+    if (mode == ERROR_MODE_RA) {
+      dPobs = pow(10.0, (6.0 * measure[0].dXccd - 3.0));  // dXccd is a value in pixels
+    }
+    if (mode == ERROR_MODE_DEC) {
+      dPobs = pow(10.0, (6.0 * measure[0].dYccd - 3.0));  // dXccd is a value in pixels
+    }
+  }
+
   AS    = code[0].astromErrScale;
   MS    = code[0].astromErrMagScale;
@@ -53 +62 @@
   dM    = measure[0].dM;
   dPtotal = sqrt(SQ(dPsys) + SQ(AS*dPobs) + SQ(MS*dM));
-
-  if (measure[0].photcode == 1030) {
-    if (mode == ERROR_MODE_RA) {
-      dPobs = pow(10.0, (6.0 * measure[0].dXccd - 3.0));  // dXccd is a value in pixels
-    }
-    if (mode == ERROR_MODE_DEC) {
-      dPobs = pow(10.0, (6.0 * measure[0].dYccd - 3.0));  // dXccd is a value in pixels
-    }
-  }
 
   // for GPC1 data, we have a bright end model:

branches/czw_branch/20160809/Ohana/src/relastro/src/launch_region_hosts.c

@@ -164 +164 @@
     if (CHIPMAP)            strextend (&command, "-chipmap %d", CHIPMAP); 
     if (ChipMapLoop)        strextend (&command, "-chipmaploop %s", ChipMapLoopStr); 
-    if (ChipOrderLoop)      strextend (&command, "-chiporderloop %s", ChipMapLoopStr); 
+    if (ChipOrderLoop)      strextend (&command, "-chiporderloop %s", ChipOrderLoopStr); 
 
     if (RESET_IMAGES)       strextend (&command, "-reset-images");