Index: trunk/ippToPsps/src/ippToPspsStackEnums.h
===================================================================
--- trunk/ippToPsps/src/ippToPspsStackEnums.h	(revision 27431)
+++ trunk/ippToPsps/src/ippToPspsStackEnums.h	(revision 29197)
@@ -35,25 +35,27 @@
   STACKMETA_CRPIX1 = 30,
   STACKMETA_CRPIX2 = 31,
-  STACKMETA_PC001001 = 32,
-  STACKMETA_PC001002 = 33,
-  STACKMETA_PC002001 = 34,
-  STACKMETA_PC002002 = 35,
-  STACKMETA_POLYORDER = 36,
-  STACKMETA_PCA1X3Y0 = 37,
-  STACKMETA_PCA1X2Y1 = 38,
-  STACKMETA_PCA1X1Y2 = 39,
-  STACKMETA_PCA1X0Y3 = 40,
-  STACKMETA_PCA1X2Y0 = 41,
-  STACKMETA_PCA1X1Y1 = 42,
-  STACKMETA_PCA1X0Y2 = 43,
-  STACKMETA_PCA2X3Y0 = 44,
-  STACKMETA_PCA2X2Y1 = 45,
-  STACKMETA_PCA2X1Y2 = 46,
-  STACKMETA_PCA2X0Y3 = 47,
-  STACKMETA_PCA2X2Y0 = 48,
-  STACKMETA_PCA2X1Y1 = 49,
-  STACKMETA_PCA2X0Y2 = 50,
-  STACKMETA_CALIBMODNUM = 51,
-  STACKMETA_DATARELEASE = 52,
+  STACKMETA_CDELT1 = 32,
+  STACKMETA_CDELT2 = 33,
+  STACKMETA_PC001001 = 34,
+  STACKMETA_PC001002 = 35,
+  STACKMETA_PC002001 = 36,
+  STACKMETA_PC002002 = 37,
+  STACKMETA_POLYORDER = 38,
+  STACKMETA_PCA1X3Y0 = 39,
+  STACKMETA_PCA1X2Y1 = 40,
+  STACKMETA_PCA1X1Y2 = 41,
+  STACKMETA_PCA1X0Y3 = 42,
+  STACKMETA_PCA1X2Y0 = 43,
+  STACKMETA_PCA1X1Y1 = 44,
+  STACKMETA_PCA1X0Y2 = 45,
+  STACKMETA_PCA2X3Y0 = 46,
+  STACKMETA_PCA2X2Y1 = 47,
+  STACKMETA_PCA2X1Y2 = 48,
+  STACKMETA_PCA2X0Y3 = 49,
+  STACKMETA_PCA2X2Y0 = 50,
+  STACKMETA_PCA2X1Y1 = 51,
+  STACKMETA_PCA2X0Y2 = 52,
+  STACKMETA_CALIBMODNUM = 53,
+  STACKMETA_DATARELEASE = 54,
 } StackMeta;
 
@@ -107,64 +109,285 @@
 
 typedef enum {
-  SKINNYOBJECT_OBJID = 1,
-  SKINNYOBJECT_IPPOBJID = 2,
-  SKINNYOBJECT_PROJECTIONCELLID = 3,
-  SKINNYOBJECT_DATARELEASE = 4,
-} SkinnyObject;
-
-typedef enum {
-  STACKORPHAN_PARTITIONKEY = 1,
-  STACKORPHAN_STACKDETECTID = 2,
-  STACKORPHAN_IPPDETECTID = 3,
-  STACKORPHAN_FILTERID = 4,
-  STACKORPHAN_STACKTYPEID = 5,
-  STACKORPHAN_SURVEYID = 6,
-  STACKORPHAN_PRIMARYF = 7,
-  STACKORPHAN_STACKMETAID = 8,
-  STACKORPHAN_SKYCELLID = 9,
-  STACKORPHAN_STACKVER = 10,
-  STACKORPHAN_XPOS = 11,
-  STACKORPHAN_YPOS = 12,
-  STACKORPHAN_XPOSERR = 13,
-  STACKORPHAN_YPOSERR = 14,
-  STACKORPHAN_INSTFLUX = 15,
-  STACKORPHAN_INSTFLUXERR = 16,
-  STACKORPHAN_PEAKFLUX = 17,
-  STACKORPHAN_SKY = 18,
-  STACKORPHAN_SKYERR = 19,
-  STACKORPHAN_SGSEP = 20,
-  STACKORPHAN_PSFWIDMAJOR = 21,
-  STACKORPHAN_PSFWIDMINOR = 22,
-  STACKORPHAN_PSFTHETA = 23,
-  STACKORPHAN_PSFLIKELIHOOD = 24,
-  STACKORPHAN_PSFCF = 25,
-  STACKORPHAN_INFOFLAG = 26,
-  STACKORPHAN_NFRAMES = 27,
-  STACKORPHAN_WLSIGMA = 28,
-  STACKORPHAN_EPS1 = 29,
-  STACKORPHAN_EPS2 = 30,
-  STACKORPHAN_PSM11 = 31,
-  STACKORPHAN_PSM12 = 32,
-  STACKORPHAN_PSM21 = 33,
-  STACKORPHAN_PSM22 = 34,
-  STACKORPHAN_PSH11 = 35,
-  STACKORPHAN_PSH12 = 36,
-  STACKORPHAN_PSH21 = 37,
-  STACKORPHAN_PSH22 = 38,
-  STACKORPHAN_ACTIVEFLAG = 39,
-  STACKORPHAN_ASSOCDATE = 40,
-  STACKORPHAN_HISTORYMODNUM = 41,
-  STACKORPHAN_DATARELEASE = 42,
-} StackOrphan;
-
-typedef enum {
-  OBJECTCALCOLOR_OBJID = 1,
-  OBJECTCALCOLOR_IPPOBJID = 2,
-  OBJECTCALCOLOR_FILTERID = 3,
-  OBJECTCALCOLOR_CALCOLOR = 4,
-  OBJECTCALCOLOR_CALCOLORERR = 5,
-  OBJECTCALCOLOR_CALIBMODNUM = 6,
-  OBJECTCALCOLOR_DATARELEASE = 7,
-} ObjectCalColor;
+  STACKAPFLX_OBJID = 1,
+  STACKAPFLX_STACKDETECTID = 2,
+  STACKAPFLX_IPPOBJID = 3,
+  STACKAPFLX_IPPDETECTID = 4,
+  STACKAPFLX_FILTERID = 5,
+  STACKAPFLX_STACKTYPEID = 6,
+  STACKAPFLX_SURVEYID = 7,
+  STACKAPFLX_PRIMARYF = 8,
+  STACKAPFLX_STACKMETAID = 9,
+  STACKAPFLX_ISOPHOTMAG = 10,
+  STACKAPFLX_ISOPHOTMAGERR = 11,
+  STACKAPFLX_ISOPHOTMAJAXIS = 12,
+  STACKAPFLX_ISOPHOTMAJAXISERR = 13,
+  STACKAPFLX_ISOPHOTMINAXIS = 14,
+  STACKAPFLX_ISOPHOTMINAXISERR = 15,
+  STACKAPFLX_ISOPHOTMAJAXISGRAD = 16,
+  STACKAPFLX_ISOPHOTMINAXISGRAD = 17,
+  STACKAPFLX_ISOPHOTPA = 18,
+  STACKAPFLX_ISOPHOTPAERR = 19,
+  STACKAPFLX_ISOPHOTPAGRAD = 20,
+  STACKAPFLX_PETRADIUS = 21,
+  STACKAPFLX_PETRADIUSERR = 22,
+  STACKAPFLX_PETMAG = 23,
+  STACKAPFLX_PETMAGERR = 24,
+  STACKAPFLX_PETR50 = 25,
+  STACKAPFLX_PETR50ERR = 26,
+  STACKAPFLX_PETR90 = 27,
+  STACKAPFLX_PETR90ERR = 28,
+  STACKAPFLX_PETCF = 29,
+  STACKAPFLX_FLXR1 = 30,
+  STACKAPFLX_FLXR1ERR = 31,
+  STACKAPFLX_FLXR1VAR = 32,
+  STACKAPFLX_FLXR2 = 33,
+  STACKAPFLX_FLXR2ERR = 34,
+  STACKAPFLX_FLXR2VAR = 35,
+  STACKAPFLX_FLXR3 = 36,
+  STACKAPFLX_FLXR3ERR = 37,
+  STACKAPFLX_FLXR3VAR = 38,
+  STACKAPFLX_FLXR4 = 39,
+  STACKAPFLX_FLXR4ERR = 40,
+  STACKAPFLX_FLXR4VAR = 41,
+  STACKAPFLX_FLXR5 = 42,
+  STACKAPFLX_FLXR5ERR = 43,
+  STACKAPFLX_FLXR5VAR = 44,
+  STACKAPFLX_FLXR6 = 45,
+  STACKAPFLX_FLXR6ERR = 46,
+  STACKAPFLX_FLXR6VAR = 47,
+  STACKAPFLX_FLXR7 = 48,
+  STACKAPFLX_FLXR7ERR = 49,
+  STACKAPFLX_FLXR7VAR = 50,
+  STACKAPFLX_FLXR8 = 51,
+  STACKAPFLX_FLXR8ERR = 52,
+  STACKAPFLX_FLXR8VAR = 53,
+  STACKAPFLX_FLXR9 = 54,
+  STACKAPFLX_FLXR9ERR = 55,
+  STACKAPFLX_FLXR9VAR = 56,
+  STACKAPFLX_FLXR10 = 57,
+  STACKAPFLX_FLXR10ERR = 58,
+  STACKAPFLX_FLXR10VAR = 59,
+  STACKAPFLX_C1FLXR1 = 60,
+  STACKAPFLX_C1FLXR1ERR = 61,
+  STACKAPFLX_C1FLXR1VAR = 62,
+  STACKAPFLX_C1FLXR2 = 63,
+  STACKAPFLX_C1FLXR2ERR = 64,
+  STACKAPFLX_C1FLXR2VAR = 65,
+  STACKAPFLX_C1FLXR3 = 66,
+  STACKAPFLX_C1FLXR3ERR = 67,
+  STACKAPFLX_C1FLXR3VAR = 68,
+  STACKAPFLX_C1FLXR4 = 69,
+  STACKAPFLX_C1FLXR4ERR = 70,
+  STACKAPFLX_C1FLXR4VAR = 71,
+  STACKAPFLX_C1FLXR5 = 72,
+  STACKAPFLX_C1FLXR5ERR = 73,
+  STACKAPFLX_C1FLXR5VAR = 74,
+  STACKAPFLX_C1FLXR6 = 75,
+  STACKAPFLX_C1FLXR6ERR = 76,
+  STACKAPFLX_C1FLXR6VAR = 77,
+  STACKAPFLX_C1FLXR7 = 78,
+  STACKAPFLX_C1FLXR7ERR = 79,
+  STACKAPFLX_C1FLXR7VAR = 80,
+  STACKAPFLX_C1FLXR8 = 81,
+  STACKAPFLX_C1FLXR8ERR = 82,
+  STACKAPFLX_C1FLXR8VAR = 83,
+  STACKAPFLX_C1FLXR9 = 84,
+  STACKAPFLX_C1FLXR9ERR = 85,
+  STACKAPFLX_C1FLXR9VAR = 86,
+  STACKAPFLX_C1FLXR10 = 87,
+  STACKAPFLX_C1FLXR10ERR = 88,
+  STACKAPFLX_C1FLXR10VAR = 89,
+  STACKAPFLX_C2FLXR1 = 90,
+  STACKAPFLX_C2FLXR1ERR = 91,
+  STACKAPFLX_C2FLXR1VAR = 92,
+  STACKAPFLX_C2FLXR2 = 93,
+  STACKAPFLX_C2FLXR2ERR = 94,
+  STACKAPFLX_C2FLXR2VAR = 95,
+  STACKAPFLX_C2FLXR3 = 96,
+  STACKAPFLX_C2FLXR3ERR = 97,
+  STACKAPFLX_C2FLXR3VAR = 98,
+  STACKAPFLX_C2FLXR4 = 99,
+  STACKAPFLX_C2FLXR4ERR = 100,
+  STACKAPFLX_C2FLXR4VAR = 101,
+  STACKAPFLX_C2FLXR5 = 102,
+  STACKAPFLX_C2FLXR5ERR = 103,
+  STACKAPFLX_C2FLXR5VAR = 104,
+  STACKAPFLX_C2FLXR6 = 105,
+  STACKAPFLX_C2FLXR6ERR = 106,
+  STACKAPFLX_C2FLXR6VAR = 107,
+  STACKAPFLX_C2FLXR7 = 108,
+  STACKAPFLX_C2FLXR7ERR = 109,
+  STACKAPFLX_C2FLXR7VAR = 110,
+  STACKAPFLX_C2FLXR8 = 111,
+  STACKAPFLX_C2FLXR8ERR = 112,
+  STACKAPFLX_C2FLXR8VAR = 113,
+  STACKAPFLX_C2FLXR9 = 114,
+  STACKAPFLX_C2FLXR9ERR = 115,
+  STACKAPFLX_C2FLXR9VAR = 116,
+  STACKAPFLX_C2FLXR10 = 117,
+  STACKAPFLX_C2FLXR10ERR = 118,
+  STACKAPFLX_C2FLXR10VAR = 119,
+  STACKAPFLX_C3FLXR1 = 120,
+  STACKAPFLX_C3FLXR1ERR = 121,
+  STACKAPFLX_C3FLXR1VAR = 122,
+  STACKAPFLX_C3FLXR2 = 123,
+  STACKAPFLX_C3FLXR2ERR = 124,
+  STACKAPFLX_C3FLXR2VAR = 125,
+  STACKAPFLX_C3FLXR3 = 126,
+  STACKAPFLX_C3FLXR3ERR = 127,
+  STACKAPFLX_C3FLXR3VAR = 128,
+  STACKAPFLX_C3FLXR4 = 129,
+  STACKAPFLX_C3FLXR4ERR = 130,
+  STACKAPFLX_C3FLXR4VAR = 131,
+  STACKAPFLX_C3FLXR5 = 132,
+  STACKAPFLX_C3FLXR5ERR = 133,
+  STACKAPFLX_C3FLXR5VAR = 134,
+  STACKAPFLX_C3FLXR6 = 135,
+  STACKAPFLX_C3FLXR6ERR = 136,
+  STACKAPFLX_C3FLXR6VAR = 137,
+  STACKAPFLX_C3FLXR7 = 138,
+  STACKAPFLX_C3FLXR7ERR = 139,
+  STACKAPFLX_C3FLXR7VAR = 140,
+  STACKAPFLX_C3FLXR8 = 141,
+  STACKAPFLX_C3FLXR8ERR = 142,
+  STACKAPFLX_C3FLXR8VAR = 143,
+  STACKAPFLX_C3FLXR9 = 144,
+  STACKAPFLX_C3FLXR9ERR = 145,
+  STACKAPFLX_C3FLXR9VAR = 146,
+  STACKAPFLX_C3FLXR10 = 147,
+  STACKAPFLX_C3FLXR10ERR = 148,
+  STACKAPFLX_C3FLXR10VAR = 149,
+  STACKAPFLX_LOGC = 150,
+  STACKAPFLX_LOGA = 151,
+  STACKAPFLX_ACTIVEFLAG = 152,
+  STACKAPFLX_DATARELEASE = 153,
+} StackApFlx;
+
+typedef enum {
+  STACKMODELFIT_OBJID = 1,
+  STACKMODELFIT_STACKDETECTID = 2,
+  STACKMODELFIT_IPPOBJID = 3,
+  STACKMODELFIT_IPPDETECTID = 4,
+  STACKMODELFIT_FILTERID = 5,
+  STACKMODELFIT_STACKTYPEID = 6,
+  STACKMODELFIT_SURVEYID = 7,
+  STACKMODELFIT_PRIMARYF = 8,
+  STACKMODELFIT_STACKMETAID = 9,
+  STACKMODELFIT_DEVRADIUS = 10,
+  STACKMODELFIT_DEVRADIUSERR = 11,
+  STACKMODELFIT_DEVMAG = 12,
+  STACKMODELFIT_DEVMAGERR = 13,
+  STACKMODELFIT_DEVAB = 14,
+  STACKMODELFIT_DEVABERR = 15,
+  STACKMODELFIT_RADEVOFF = 16,
+  STACKMODELFIT_DECDEVOFF = 17,
+  STACKMODELFIT_RADEVOFFERR = 18,
+  STACKMODELFIT_DECDEVOFFERR = 19,
+  STACKMODELFIT_DEVCF = 20,
+  STACKMODELFIT_DEVLIKELIHOOD = 21,
+  STACKMODELFIT_DEVCOVAR11 = 22,
+  STACKMODELFIT_DEVCOVAR12 = 23,
+  STACKMODELFIT_DEVCOVAR13 = 24,
+  STACKMODELFIT_DEVCOVAR14 = 25,
+  STACKMODELFIT_DEVCOVAR15 = 26,
+  STACKMODELFIT_DEVCOVAR16 = 27,
+  STACKMODELFIT_DEVCOVAR22 = 28,
+  STACKMODELFIT_DEVCOVAR23 = 29,
+  STACKMODELFIT_DEVCOVAR24 = 30,
+  STACKMODELFIT_DEVCOVAR25 = 31,
+  STACKMODELFIT_DEVCOVAR26 = 32,
+  STACKMODELFIT_DEVCOVAR33 = 33,
+  STACKMODELFIT_DEVCOVAR34 = 34,
+  STACKMODELFIT_DEVCOVAR35 = 35,
+  STACKMODELFIT_DEVCOVAR36 = 36,
+  STACKMODELFIT_DEVCOVAR44 = 37,
+  STACKMODELFIT_DEVCOVAR45 = 38,
+  STACKMODELFIT_DEVCOVAR46 = 39,
+  STACKMODELFIT_DEVCOVAR55 = 40,
+  STACKMODELFIT_DEVCOVAR56 = 41,
+  STACKMODELFIT_DEVCOVAR66 = 42,
+  STACKMODELFIT_EXPRADIUS = 43,
+  STACKMODELFIT_EXPRADIUSERR = 44,
+  STACKMODELFIT_EXPMAG = 45,
+  STACKMODELFIT_EXPMAGERR = 46,
+  STACKMODELFIT_EXPAB = 47,
+  STACKMODELFIT_EXPABERR = 48,
+  STACKMODELFIT_RAEXPOFF = 49,
+  STACKMODELFIT_DECEXPOFF = 50,
+  STACKMODELFIT_RAEXPOFFERR = 51,
+  STACKMODELFIT_DECEXPOFFERR = 52,
+  STACKMODELFIT_EXPCF = 53,
+  STACKMODELFIT_EXPLIKELIHOOD = 54,
+  STACKMODELFIT_EXPCOVAR11 = 55,
+  STACKMODELFIT_EXPCOVAR12 = 56,
+  STACKMODELFIT_EXPCOVAR13 = 57,
+  STACKMODELFIT_EXPCOVAR14 = 58,
+  STACKMODELFIT_EXPCOVAR15 = 59,
+  STACKMODELFIT_EXPCOVAR16 = 60,
+  STACKMODELFIT_EXPCOVAR22 = 61,
+  STACKMODELFIT_EXPCOVAR23 = 62,
+  STACKMODELFIT_EXPCOVAR24 = 63,
+  STACKMODELFIT_EXPCOVAR25 = 64,
+  STACKMODELFIT_EXPCOVAR26 = 65,
+  STACKMODELFIT_EXPCOVAR33 = 66,
+  STACKMODELFIT_EXPCOVAR34 = 67,
+  STACKMODELFIT_EXPCOVAR35 = 68,
+  STACKMODELFIT_EXPCOVAR36 = 69,
+  STACKMODELFIT_EXPCOVAR44 = 70,
+  STACKMODELFIT_EXPCOVAR45 = 71,
+  STACKMODELFIT_EXPCOVAR46 = 72,
+  STACKMODELFIT_EXPCOVAR55 = 73,
+  STACKMODELFIT_EXPCOVAR56 = 74,
+  STACKMODELFIT_EXPCOVAR66 = 75,
+  STACKMODELFIT_SERRADIUS = 76,
+  STACKMODELFIT_SERRADIUSERR = 77,
+  STACKMODELFIT_SERMAG = 78,
+  STACKMODELFIT_SERMAGERR = 79,
+  STACKMODELFIT_SERAB = 80,
+  STACKMODELFIT_SERABERR = 81,
+  STACKMODELFIT_SERNU = 82,
+  STACKMODELFIT_SERNUERR = 83,
+  STACKMODELFIT_RASEROFF = 84,
+  STACKMODELFIT_DECSEROFF = 85,
+  STACKMODELFIT_RASEROFFERR = 86,
+  STACKMODELFIT_DECSEROFFERR = 87,
+  STACKMODELFIT_SERCF = 88,
+  STACKMODELFIT_SERLIKELIHOOD = 89,
+  STACKMODELFIT_SERSICCOVAR11 = 90,
+  STACKMODELFIT_SERSICCOVAR12 = 91,
+  STACKMODELFIT_SERSICCOVAR13 = 92,
+  STACKMODELFIT_SERSICCOVAR14 = 93,
+  STACKMODELFIT_SERSICCOVAR15 = 94,
+  STACKMODELFIT_SERSICCOVAR16 = 95,
+  STACKMODELFIT_SERSICCOVAR17 = 96,
+  STACKMODELFIT_SERSICCOVAR22 = 97,
+  STACKMODELFIT_SERSICCOVAR23 = 98,
+  STACKMODELFIT_SERSICCOVAR24 = 99,
+  STACKMODELFIT_SERSICCOVAR25 = 100,
+  STACKMODELFIT_SERSICCOVAR26 = 101,
+  STACKMODELFIT_SERSICCOVAR27 = 102,
+  STACKMODELFIT_SERSICCOVAR33 = 103,
+  STACKMODELFIT_SERSICCOVAR34 = 104,
+  STACKMODELFIT_SERSICCOVAR35 = 105,
+  STACKMODELFIT_SERSICCOVAR36 = 106,
+  STACKMODELFIT_SERSICCOVAR37 = 107,
+  STACKMODELFIT_SERSICCOVAR44 = 108,
+  STACKMODELFIT_SERSICCOVAR45 = 109,
+  STACKMODELFIT_SERSICCOVAR46 = 110,
+  STACKMODELFIT_SERSICCOVAR47 = 111,
+  STACKMODELFIT_SERSICCOVAR55 = 112,
+  STACKMODELFIT_SERSICCOVAR56 = 113,
+  STACKMODELFIT_SERSICCOVAR57 = 114,
+  STACKMODELFIT_SERSICCOVAR66 = 115,
+  STACKMODELFIT_SERSICCOVAR67 = 116,
+  STACKMODELFIT_SERSICCOVAR77 = 117,
+  STACKMODELFIT_ACTIVEFLAG = 118,
+  STACKMODELFIT_DATARELEASE = 119,
+} StackModelFit;
+
+typedef enum {
+  STACKTOIMAGE_STACKMETAID = 1,
+  STACKTOIMAGE_IMAGEID = 2,
+} StackToImage;
 
 #endif
