Index: trunk/Ohana/src/addstar/src/mkcmf.c
===================================================================
--- trunk/Ohana/src/addstar/src/mkcmf.c	(revision 38892)
+++ trunk/Ohana/src/addstar/src/mkcmf.c	(revision 38893)
@@ -59,4 +59,6 @@
   }
 
+  int isStack = FALSE;
+  int isForcedWarp = FALSE;
   int WriteXSRC = FALSE;
   int WriteXFIT = FALSE;
@@ -66,4 +68,10 @@
     remove_argument (N, &argc, argv);
     WriteXSRC = WriteXFIT = WriteXRAD = WriteDETF = TRUE;
+    isStack = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-forcedwarp"))) {
+    remove_argument (N, &argc, argv);
+    WriteXSRC = WriteXFIT = WriteXRAD = WriteDETF = TRUE;
+    isForcedWarp = TRUE;
   }
 
@@ -87,4 +95,18 @@
     remove_argument (N, &argc, argv);
     date = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  static char *tess_id = "RINGS.V3";
+  if ((N = get_argument (argc, argv, "-tess_id"))) {
+    remove_argument (N, &argc, argv);
+    tess_id = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  static char *skycell = "skycell.1133.081";
+  if ((N = get_argument (argc, argv, "-skycell"))) {
+    remove_argument (N, &argc, argv);
+    skycell = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -222,6 +244,11 @@
   coords.crpix2 = CRPIX2;
   
-  coords.cdelt1 = 0.25/3600.0;
-  coords.cdelt2 = 0.25/3600.0;
+  if (isStack || isForcedWarp) {
+    coords.cdelt1 = 0.25/3600.0;
+    coords.cdelt2 = 0.25/3600.0;
+  } else {
+    coords.cdelt1 = 0.257/3600.0;
+    coords.cdelt2 = 0.257/3600.0;
+  }
 
   // load stars and generate complete output fields
@@ -325,6 +352,4 @@
   gfits_modify (&header, "MSKY_MN",           "%f", 1, SKY);
   gfits_modify (&header, "MSKY_SIG",          "%f", 1, DSKY);
-  gfits_modify (&header, "DETEFF.MAGREF",     "%f", 1, -5.0);
-  gfits_modify (&header, "ZPT_OBS",           "%f", 1, 25.0);
   gfits_modify (&header, "ZPT_ERR",           "%f", 1, 0.03);
   gfits_modify (&header, "ANGLE",             "%f", 1, 0.1);
@@ -338,10 +363,6 @@
   gfits_modify (&header, "DAPMIFIT",          "%f", 1, 0.03);
   gfits_modify (&header, "DETECTOR",          "%s", 1, "CCID58-1-02a2");
-  gfits_modify (&header, "DETREND.MASK",      "%s", 1, "detref615.XY33.fits");
-  gfits_modify (&header, "DETREND.DARK",      "%s", 1, "GPC1.DARKTEST.norm.856.0.XY33.fits");
-  gfits_modify (&header, "DETREND.FLAT",      "%s", 1, "GPC1.FLATTEST.300.XY33.co.fits");
-  gfits_modify (&header, "DETREND.NOISEMAP",  "%s", 1, "GPC1.noisemap.norm.965.0.XY33.fits");
-  gfits_modify (&header, "DETREND.NONLIN",    "%s", 1, "linearity_data.XY33.fits");
-  gfits_modify (&header, "DETREND.VIDEODARK", "%s", 1, "GPC1.VIDEODARK.979.0.XY33.fits");
+
+  gfits_modify (&header, "HIERARCH DETEFF.MAGREF", "%f", 1, -5.0);
 
   gfits_modify (&header, "PSFMODEL",          "%s", 1, "PS_MODEL_PS1_V1");
@@ -349,6 +370,26 @@
   gfits_modify (&header, "AST_CDY",           "%f", 1, 0.04);
 
-  // gfits_modify (&header, "ZPT_OBS",       "%", 1, );
-  // gfits_modify (&header, "CERROR",        "%f", 1, );
+  if (!isStack && !isForcedWarp) {
+    gfits_modify (&header, "HIERARCH DETREND.MASK",      "%s", 1, "detref615.XY33.fits");
+    gfits_modify (&header, "HIERARCH DETREND.DARK",      "%s", 1, "GPC1.DARKTEST.norm.856.0.XY33.fits");
+    gfits_modify (&header, "HIERARCH DETREND.FLAT",      "%s", 1, "GPC1.FLATTEST.300.XY33.co.fits");
+    gfits_modify (&header, "HIERARCH DETREND.NOISEMAP",  "%s", 1, "GPC1.noisemap.norm.965.0.XY33.fits");
+    gfits_modify (&header, "HIERARCH DETREND.NONLIN",    "%s", 1, "linearity_data.XY33.fits");
+    gfits_modify (&header, "HIERARCH DETREND.VIDEODARK", "%s", 1, "GPC1.VIDEODARK.979.0.XY33.fits");
+    gfits_modify (&header, "ZPT_OBS",           "%f", 1, 25.0);
+  }
+
+  if (isStack) {
+    gfits_modify (&header, "HIERARCH FPA.ZP", "%f", 1, 25.0);
+    gfits_modify (&header, "TESS_ID",         "%s", 1, tess_id);
+    gfits_modify (&header, "SKYCELL",         "%s", 1, skycell);
+  }
+  if (isForcedWarp) {
+    gfits_modify (&header, "HIERARCH FPA.FILTERID", "%s", 1, "r.00000");
+    gfits_modify (&header, "HIERARCH FPA.ZP", 	    "%f", 1, 25.0);
+    gfits_modify (&header, "TESS_ID",         "%s", 1, tess_id);
+    gfits_modify (&header, "SKYCELL",         "%s", 1, skycell);
+    gfits_modify (&header, "PHOT_V",                "%s", 1, "38100");
+  }
 
   int i;