Commit 1f7dc1df authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner Committed by Stuart Sides
Browse files

Warning for photomet added (#3486) 

* added warning if anglesource option is used with mixed or topo normalization method; based on github tickets 3451 and 3452

* adding tests

* Addressing Stuarts comments

* Addressing Kristin's comment
parent d6ea4064

isis/src/base/apps/photomet/main.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1758,6 +1758,12 @@ void IsisMain() { 
  // determine how photometric angles should be calculated

  angleSource = ui.GetString("ANGLESOURCE");



  if ((normName == "TOPO" || normName == "MIXED") && angleSource == "DEM") {

    QString message = "The " + normName + " Normalized model is not recommended for use with the " + angleSource + " Angle Source option";

    PvlGroup warning("Warnings");

    warning.addKeyword(PvlKeyword("Warning",message));

    Application::Log(warning);

  }

  // Get camera information if needed

  if (angleSource == "ELLIPSOID" || angleSource == "DEM" ||

      angleSource == "CENTER_FROM_IMAGE") {

isis/src/base/apps/photomet/photomet.xml

+448 −445
Original line number Diff line number Diff line
@@ -1012,6 +1012,10 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective 
      using the from the IAU/NAIF target body file, which is defined within the cube's kernel group

      as the TargetAttitudeShape. Fixes #4180.

    </change>

    <change name="Lauren Adoram-Kershner" date="2019-11-07">

      Added a warning when the 'DEM' angle source option is used with 'mixed'

      or 'topo' normalization method. Fixes #3451 and #3452.

    </change>

  </history>



  <category>
@@ -3502,4 +3506,3 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective 


  </examples>

</application>

isis/src/base/apps/photomet/tsts/testDemWarning/Makefile

0 → 100644
+28 −0
Original line number Diff line number Diff line 
APPNAME = photomet



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/cropped.cub \

	to=$(OUTPUT)/angleSourceDemUsedemFalse.cub \

	maxemission=87.0 \

	anglesource=dem \

	phtname=minnaert \

	k=0.5 \

	normname=mixed \

	incref=0 \

	incmat=80 \

	thresh=30 \

	albedo=1.0 > $(OUTPUT)/test_mix_DEM.pvl;

	$(APPNAME) from=$(INPUT)/cropped.cub \

  to=$(OUTPUT)/angleSourceDemUsedemFalse.cub \

  maxemission=87.0 \

  anglesource=dem \

  phtname=minnaert \

  k=0.5 \

  normname=topo \

  incref=0 \

  thresh=30 \

  albedo=1.0 > $(OUTPUT)/test_topo_DEM.pvl;



	$(RM) $(OUTPUT)/angleSourceDemUsedemFalse.cub ;