Commit 44d34ee0 authored by Jeffrey Covington's avatar Jeffrey Covington
Browse files

Removed unreachable code in thmproc. Fixes #2163 

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

isis/src/odyssey/apps/thmproc/thmproc.cpp

+1 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void IsisMain() { 
  if(ui.GetBoolean("INGESTION")) {

    Pvl labels(ui.GetFileName("FROM"));



    if((QString)labels["DETECTOR_ID"][0] == "VIS") { // JWB - can we process vis without ingestion?

    if((QString)labels["DETECTOR_ID"][0] == "VIS") { 

      if(((QString)labels["DATA_SET_ID"]).contains("RDR")) {

        ProcessVis(true);

      }
@@ -93,12 +93,7 @@ void ProcessVis(bool isRdr) { 
  p.Application("automos").SetInputParameter("FROMLIST", PipelineApplication::LastAppOutputList, false);

  p.Application("automos").SetOutputParameter("MOSAIC", "mos");



  if(ui.GetBoolean("INGESTION")) { // JWB - inconsistent with call in main

  p.SetFirstApplication("thm2isis");

  }

  else {

    p.SetFirstApplication("spiceinit");

  }



  if(ui.GetBoolean("MAPPING")) {

    p.SetLastApplication("automos");

isis/src/odyssey/apps/thmproc/thmproc.xml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ 
      map. Added vis test for EDR data with MAPPING=true. Added error test. Improved test coverage 

      to 95/98/100%. References #1659.

    </change>

    <change name="Jeffrey Covington" date="2015-01-27">

      Removed unreachable code.

    </change>

  </history>



  <category>