Commit 9578b99a authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updates made to Hayabusa AMICA calibration program. Fixes #5243. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@8315 41f8697f-d340-4b68-9986-7bafba869bb8
parent 35db6809

isis/src/hayabusa/apps/amicacal/amicacal.cpp

+241 −193

File changed.

Preview size limit exceeded, changes collapsed.

isis/src/hayabusa/apps/amicacal/amicacal.xml

+16 −8
Original line number Diff line number Diff line
@@ -522,16 +522,24 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
    </change>

    <change name="Kristin Berry" date="2017-02-07">

       Removed the "APPLYSMEAR" option as a user-specifiable parameter. The smear correction

       will still be applied automatically when an image is being processed for which on-board smear 

       correction was not applied (NSUB &lt;= 1). Also updated application code for conformity with ISIS3

       Coding Standards. Backward Compatibility Issue: The APPLYSMEAR parameter was removed. The smear

       correction will automatically be applied to images with 1 sub-image. 

       will still be applied automatically when an image is being processed for which on-board 

       smear correction was not applied (NSUB &lt;= 1). Also updated application code for 

       conformity with ISIS3 Coding Standards. Backward Compatibility Issue: The APPLYSMEAR

       parameter was removed. The smear correction will automatically be applied to images with

       1 sub-image. 

    </change>

    <change name="Kristin Berry" date="2017-02-08">

       Removed the "PSF" correction option, since the PSF correction is not yet working. Related code has been commented-

       out rather than removed entirely so that this work can potentially be resumed at a later date. 

       Backward Compatibility Issue: The PSF parameter was removed, since it is not yet working. 

       amicacal cannot apply a PSF correction anymore.

       Removed the "PSF" correction option, since the PSF correction is not yet working. Related 

       code has been commented out rather than removed entirely so that this work can potentially

       be resumed at a later date. Backward Compatibility Issue: The PSF parameter was removed

       since it is not yet working. The amicacal program cannot apply a PSF correction anymore.

    </change>

    <change name="Jeannie Backer" date="2017-11-28 ">

       Updated radiance calibration to divide by exposure duration, as done with reflectance. 

       Updated amicaCalibration????.trn file with latest radiance scale factor for sz 

       (value provided by L. LeCorre, PSI).

       Updated to use filter V solar flux on all calculations. 

       Brought code closer to ISIS3 coding standards. Fixes #5243

    </change>

  </history>

isis/src/hayabusa/apps/amicacal/tsts/iof/Makefile

+11 −6
Original line number Diff line number Diff line 
# history 2017-11-28 Jeannie Backer - Updated truth data for corrected_iof_st_2459265790_w.cub.

#                        Cube dn differences up to 0.08 difference after update of solar flux value.

#                        (See amicacal history).  

APPNAME = amicacal



include $(ISISROOT)/make/isismake.tsts
@@ -5,8 +8,10 @@ include $(ISISROOT)/make/isismake.tsts 
commands:

	$(APPNAME) \

	    FROM=$(INPUT)/st_2459265790_w.cub \

        TO=$(OUTPUT)/corrected_iof_st_2459265790_w.cub > /dev/null;\

	    TO=$(OUTPUT)/corrected_iof_st_2459265790_w.cub \

	    > /dev/null;

	$(APPNAME) \

	    FROM=$(INPUT)/st_2459265790_w.cub \

	    TO=$(OUTPUT)/corrected_noiof_st_2459265790_w.cub \

        units=dn > /dev/null;
 
	    units=dn \

	    > /dev/null;

isis/src/hayabusa/apps/amicacal/tsts/nullpolarpix/Makefile

+13 −6
Original line number Diff line number Diff line 
# history 2017-11-28 Jeannie Backer - Updated truth data for 

#                        corrected_polarpixnulled_st_2459265790_w.cub.

#                        and corrected_polarpixnotnulled_st_2459265790_w.cub.

#                        Cube dn differences up to 0.08 difference after update of solar flux value.

#                        (See amicacal history).

APPNAME = amicacal



include $(ISISROOT)/make/isismake.tsts
@@ -5,8 +10,10 @@ include $(ISISROOT)/make/isismake.tsts 
commands:

	$(APPNAME) \

	    FROM=$(INPUT)/st_2459265790_w.cub \

        TO=$(OUTPUT)/corrected_polarpixnulled_st_2459265790_w.cub >/dev/null;\

	    TO=$(OUTPUT)/corrected_polarpixnulled_st_2459265790_w.cub \

	    >/dev/null;

	$(APPNAME) \

	    FROM=$(INPUT)/st_2459265790_w.cub \

	    TO=$(OUTPUT)/corrected_polarpixnotnulled_st_2459265790_w.cub \

        nullpolarpix=no > /dev/null;
 
	    nullpolarpix=no \

	    > /dev/null;

isis/src/hayabusa/apps/amicacal/tsts/smearCorrection/Makefile

+12 −6
Original line number Diff line number Diff line 
# history 2017-11-28 Jeannie Backer - Updated truth data for 

#                        notSmearCorrected_nsubimages2_st_2433548889_w.cub.

#                        Cube dn differences up to 0.06 difference after update of solar flux value.

#                        (See amicacal history).  

APPNAME = amicacal



include $(ISISROOT)/make/isismake.tsts
@@ -7,11 +11,13 @@ commands: 
	$(APPNAME) \

	    FROM=$(INPUT)/st_2539482843_v.cub \

	    TO=$(OUTPUT)/smearCorrected_nsubimages1_st_2539482843_v.cub.cub \

	nullpolarpix=no > /dev/null;

	    nullpolarpix=no \

	    > /dev/null;



	# Test NON-application of smear removal for SubImageCount = 2

	$(APPNAME) \

	    FROM=$(INPUT)/st_2433548889_w.cub \

	    TO=$(OUTPUT)/notSmearCorrected_nsubimages2_st_2433548889_w.cub \

	nullpolarpix=no >/dev/null;\

	    nullpolarpix=no \

	    >/dev/null;\