Index: /branches/eam_branches/ipp-20230313/Ohana/src/relphot/include/relphot.h
===================================================================
--- /branches/eam_branches/ipp-20230313/Ohana/src/relphot/include/relphot.h	(revision 42707)
+++ /branches/eam_branches/ipp-20230313/Ohana/src/relphot/include/relphot.h	(revision 42708)
@@ -489,4 +489,5 @@
 double IMAGE_GOOD_FRACTION;
 int    CALIBRATE_STACKS_AND_WARPS;
+int    CALIBRATE_WARPS_LIKE_CHIPS;
 
 int    KEEP_UBERCAL;
Index: /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/args.c
===================================================================
--- /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/args.c	(revision 42707)
+++ /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/args.c	(revision 42708)
@@ -528,4 +528,10 @@
   }
 
+  CALIBRATE_WARPS_LIKE_CHIPS = FALSE;
+  if ((N = get_argument (argc, argv, "-calibrate-warps-like-chips"))) {
+    remove_argument (N, &argc, argv);
+    CALIBRATE_WARPS_LIKE_CHIPS = TRUE;
+  }
+
   STAGES = STAGE_CHIP | STAGE_WARP | STAGE_STACK;
   if ((N = get_argument (argc, argv, "-skip-chip"))) {
@@ -988,4 +994,10 @@
   }
 
+  CALIBRATE_WARPS_LIKE_CHIPS = FALSE;
+  if ((N = get_argument (argc, argv, "-calibrate-warps-like-chips"))) {
+    remove_argument (N, &argc, argv);
+    CALIBRATE_WARPS_LIKE_CHIPS = TRUE;
+  }
+
   STAGES = STAGE_CHIP | STAGE_WARP | STAGE_STACK;
   if ((N = get_argument (argc, argv, "-skip-chip"))) {
Index: /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/extra.c
===================================================================
--- /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/extra.c	(revision 42707)
+++ /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/extra.c	(revision 42708)
@@ -91,4 +91,6 @@
 int isGPC1warp (int photcode) {
 
+  if (CALIBRATE_WARPS_LIKE_CHIPS) return FALSE;
+
   // 11000 : GPC1.g.SkyChip
   // 14100 : SIMTEST.g.SkyChip
Index: /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/reload_catalogs.c
===================================================================
--- /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/reload_catalogs.c	(revision 42707)
+++ /branches/eam_branches/ipp-20230313/Ohana/src/relphot/src/reload_catalogs.c	(revision 42708)
@@ -251,4 +251,5 @@
     if (!(STAGES & STAGE_WARP))  { strextend (&command, "-skip-warp"); }
     if (!(STAGES & STAGE_STACK)) { strextend (&command, "-skip-stack"); }
+    if (CALIBRATE_WARPS_LIKE_CHIPS) { strextend (&command, "-calibrate-warps-like-chips"); }
 
     // deprecate