Index: branches/czw_branch/20170908/ippconfig/hsc/Makefile.am =================================================================== --- branches/czw_branch/20170908/ippconfig/hsc/Makefile.am (revision 40179) +++ branches/czw_branch/20170908/ippconfig/hsc/Makefile.am (revision 40199) @@ -8,4 +8,5 @@ format_mef.config \ format_cmf.config \ + ghost.model.mdc \ ppImage.config \ ppMerge.config \ Index: branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc =================================================================== --- branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc (revision 40179) +++ branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc (revision 40199) @@ -1,20 +1,20 @@ + + # The R_TERMS polynomials have been converted from um units to mm units to be consistent with C_TERMS polynomials. GHOST.MODEL.HSC MULTI - GHOST.MODEL.HSC METADATA +GHOST.MODEL.HSC METADATA FILTER STR g @C_TERMS F32 3.86129097e-04 -4.56480396e+02 5.94514717e+02 -8.20984903e+03 4.35455723e+04 -1.19834803e+05 1.60789252e+05 -8.66581086e+04 # a comment @R_TERMS F32 2.80257250e+00 -1.14163334e+01 6.25378363e+02 -6.59305008e+03 3.21678893e+04 -7.68658356e+04 8.71449290e+04 -3.66203193e+04 # a comment - LIMIT F32 12.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -8.66581086e+04 1.60789252e+05 -1.19834803e+05 4.35455723e+04 -8.20984903e+03 5.94514717e+02 -4.56480396e+02 3.86129097e-04 # @R_TERMS F32 -3.66203193e+04 8.71449290e+04 -7.68658356e+04 3.21678893e+04 -6.59305008e+03 6.25378363e+02 -1.14163334e+01 2.80257250e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR r @C_TERMS F32 1.10217740e-03 -4.13994264e+02 -1.08162329e+02 -1.75333116e+02 -1.44358813e+03 7.03878935e+03 -1.55470840e+04 1.05167578e+04 # a comment @R_TERMS F32 7.84632263e+00 -1.34007061e-02 9.57272709e+01 -9.45421731e+02 5.64254906e+03 -1.97396910e+04 3.55382290e+04 -2.46004825e+04 # a comment - LIMIT F32 11.5 SCALE F32 3.49794238e-06 # @C_TERMS for original r 8.14947896e+03 -1.24163720e+04 5.41143508e+03 -1.02024286e+03 -2.39667209e+02 -1.00805716e+02 -4.16757016e+02 -1.48799186e-03 @@ -23,10 +23,9 @@ # @C_TERMS F32 1.05167578e+04 -1.55470840e+04 7.03878935e+03 -1.44358813e+03 -1.75333116e+02 -1.08162329e+02 -4.13994264e+02 1.10217740e-03 # @R_TERMS F32 -2.46004825e+04 3.55382290e+04 -1.97396910e+04 5.64254906e+03 -9.45421731e+02 9.57272709e+01 -1.34007061e-02 7.84632263e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR i @C_TERMS F32 -3.95203567e-03 -4.55641159e+02 5.73358984e+02 -8.75512267e+03 5.43205903e+04 -1.74052246e+05 2.70933733e+05 -1.66554502e+05 # a comment @R_TERMS F32 2.24351724e+00 -1.59383063e+01 8.56547254e+02 -1.09461298e+04 6.86646484e+04 -2.19342516e+05 3.46712176e+05 -2.15706075e+05 # a comment - LIMIT F32 11.0 SCALE F32 3.49794238e-06 # @C_TERMS for original i 7.09135701e+03 -1.08899009e+04 4.53311864e+03 -7.45070274e+02 -2.86196488e+02 -9.58537252e+01 -4.15997892e+02 -2.10038501e-03 @@ -35,44 +34,40 @@ # @C_TERMS F32 -1.66554502e+05 2.70933733e+05 -1.74052246e+05 5.43205903e+04 -8.75512267e+03 5.73358984e+02 -4.55641159e+02 -3.95203567e-03 # @R_TERMS F32 -2.15706075e+05 3.46712176e+05 -2.19342516e+05 6.86646484e+04 -1.09461298e+04 8.56547254e+02 -1.59383063e+01 2.24351724e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR z @C_TERMS F32 -1.79546522e-03 -4.13201008e+02 -1.08898155e+02 -1.51535018e+02 -1.51139264e+03 6.94362981e+03 -1.47396976e+04 9.59579373e+03 # a comment @R_TERMS F32 7.39449641e+00 7.28959803e-01 1.06569049e+02 -1.18036333e+03 7.42160510e+03 -2.62797780e+04 4.70124953e+04 -3.23514338e+04 # a comment - LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 9.59579373e+03 -1.47396976e+04 6.94362981e+03 -1.51139264e+03 -1.51535018e+02 -1.08898155e+02 -4.13201008e+02 -1.79546522e-03 # @R_TERMS F32 -3.23514338e+04 4.70124953e+04 -2.62797780e+04 7.42160510e+03 -1.18036333e+03 1.06569049e+02 7.28959803e-01 7.39449641e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR y @C_TERMS F32 -2.04774887e-03 -4.50571358e+02 3.73884700e+02 -6.38727141e+03 4.28067607e+04 -1.47306815e+05 2.42465240e+05 -1.56137979e+05 # a comment @R_TERMS F32 2.04967838e+00 -8.92675213e+00 6.03954493e+02 -7.97354793e+03 5.32635002e+04 -1.79071587e+05 2.94475198e+05 -1.88924528e+05 # a comment - LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.56137979e+05 2.42465240e+05 -1.47306815e+05 4.28067607e+04 -6.38727141e+03 3.73884700e+02 -4.50571358e+02 -2.04774887e-03 # @R_TERMS F32 -1.88924528e+05 2.94475198e+05 -1.79071587e+05 5.32635002e+04 -7.97354793e+03 6.03954493e+02 -8.92675213e+00 2.04967838e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR NB816 @C_TERMS F32 -3.52735759e-03 -4.54174618e+02 5.11013724e+02 -8.05597593e+03 5.11417991e+04 -1.67422366e+05 2.65225596e+05 -1.65501517e+05 # a comment @R_TERMS F32 2.17954931e+00 -1.39611991e+01 7.88077371e+02 -1.01750660e+04 6.49121728e+04 -2.10323885e+05 3.36261570e+05 -2.11111649e+05 # a comment - LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.65501517e+05 2.65225596e+05 -1.67422366e+05 5.11417991e+04 -8.05597593e+03 5.11013724e+02 -4.54174618e+02 -3.52735759e-03 # @R_TERMS F32 -2.11111649e+05 3.36261570e+05 -2.10323885e+05 6.49121728e+04 -1.01750660e+04 7.88077371e+02 -1.39611991e+01 2.17954931e+00 - END - GHOST.MODEL.HSC METADATA +END +GHOST.MODEL.HSC METADATA FILTER STR NB921 @C_TERMS F32 -2.99761113e-03 -4.52301392e+02 4.49346634e+02 -7.38661211e+03 4.83455130e+04 -1.62550708e+05 2.63017929e+05 -1.66995347e+05 # a comment @R_TERMS F32 2.11290612e+00 -1.15228777e+01 7.02729746e+02 -9.20923423e+03 6.01493518e+04 -1.98625679e+05 3.22255104e+05 -2.04640222e+05 # a comment - LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.66995347e+05 2.63017929e+05 -1.62550708e+05 4.83455130e+04 -7.38661211e+03 4.49346634e+02 -4.52301392e+02 -2.99761113e-03 # @R_TERMS F32 -2.04640222e+05 3.22255104e+05 -1.98625679e+05 6.01493518e+04 -9.20923423e+03 7.02729746e+02 -1.15228777e+01 2.11290612e+00 - END END + Index: branches/czw_branch/20170908/ippconfig/hsc/psastro.config =================================================================== --- branches/czw_branch/20170908/ippconfig/hsc/psastro.config (revision 40179) +++ branches/czw_branch/20170908/ippconfig/hsc/psastro.config (revision 40199) @@ -13,43 +13,50 @@ PHOTCODE.DATA METADATA FILTER STR g - ZEROPT F32 26.75 +# ZEROPT F32 26.75 + ZEROPT F32 26.70 PHOTCODE STR g - GHOST_MAX_MAG F32 -16.5 + GHOST_MAX_MAG F32 -22.0 END PHOTCODE.DATA METADATA FILTER STR r - ZEROPT F32 27.1 +# ZEROPT F32 27.1 + ZEROPT F32 27.05 PHOTCODE STR r - GHOST_MAX_MAG F32 -20.0 + GHOST_MAX_MAG F32 -22.5 END PHOTCODE.DATA METADATA FILTER STR i - ZEROPT F32 27.0 +# ZEROPT F32 27.0 + ZEROPT F32 26.8 PHOTCODE STR i - GHOST_MAX_MAG F32 -25.0 + GHOST_MAX_MAG F32 -23.0 END PHOTCODE.DATA METADATA FILTER STR z - ZEROPT F32 26.2 +# ZEROPT F32 26.2 + ZEROPT F32 26.0 PHOTCODE STR z - GHOST_MAX_MAG F32 -25.0 + GHOST_MAX_MAG F32 -23.0 END PHOTCODE.DATA METADATA FILTER STR y - ZEROPT F32 25.1 +# ZEROPT F32 25.1 + ZEROPT F32 25.55 PHOTCODE STR y - GHOST_MAX_MAG F32 -25.0 + GHOST_MAX_MAG F32 -23.0 END PHOTCODE.DATA METADATA FILTER STR NB816 - ZEROPT F32 26.0 +# ZEROPT F32 26.0 + ZEROPT F32 23.75 PHOTCODE STR i - GHOST_MAX_MAG F32 -25.0 + GHOST_MAX_MAG F32 -23.0 END PHOTCODE.DATA METADATA FILTER STR NB921 - ZEROPT F32 25.4 +# ZEROPT F32 25.4 + ZEROPT F32 23.95 PHOTCODE STR z - GHOST_MAX_MAG F32 -25.0 + GHOST_MAX_MAG F32 -23.0 END @@ -148,5 +155,12 @@ REFSTAR_MASK_BLEED_MAG_SLOPE_Y F32 0.425 -REFSTAR_MASK_GLINTS BOOL TRUE +REFSTAR_COUNT_GHOSTS BOOL TRUE +#REFSTAR_MASK_GHOST BOOL TRUE +REFSTAR_MASK_GHOST BOOL FALSE +GHOST_MODEL STR hsc/ghost.model.mdc + + +#REFSTAR_MASK_GLINTS BOOL TRUE +REFSTAR_MASK_GLINTS BOOL FALSE GLINT_MAX_MAG F32 -19 GLINT_LENGTH_MAG_SLOPE F32 0.0