Revert "BUG: fix manits-1161"

This reverts commit 2fc0e953.

Modules/Applications/AppSARCalibration/app/CMakeLists.txt

@@ -7,8 +7,3 @@ otb_create_application(
   NAME           SarRadiometricCalibration
   SOURCES        otbSarRadiometricCalibration.cxx
   LINK_LIBRARIES ${${otb-module}_LIBRARIES})
-
-otb_create_application(
-  NAME           SARRadiometricCalibration
-  SOURCES        otbSARRadiometricCalibration.cxx
-  LINK_LIBRARIES ${${otb-module}_LIBRARIES})

Modules/Applications/AppSARCalibration/app/otbSARRadiometricCalibration.cxx

-/*=========================================================================
-
- Program:   ORFEO Toolbox
- Language:  C++
- Date:      $Date$
- Version:   $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the above copyright notices for more information.
-
- =========================================================================*/
-#include "otbWrapperApplication.h"
-#include "otbWrapperApplicationFactory.h"
-
-#include "otbSarRadiometricCalibrationToImageFilter.h"
-
-namespace otb
-{
-namespace Wrapper
-{
-class SARRadiometricCalibration : public Application
-{
-public:
-  /** Standard class typedefs. */
-  typedef SARRadiometricCalibration     Self;
-  typedef Application                   Superclass;
-  typedef itk::SmartPointer<Self>       Pointer;
-  typedef itk::SmartPointer<const Self> ConstPointer;
-
-  /** Standard macro */
-  itkNewMacro(Self);
-
-  itkTypeMacro(SARRadiometricCalibration, otb::Application);
-
-  typedef otb::SarRadiometricCalibrationToImageFilter<ComplexFloatImageType,
-                                                      FloatImageType>     CalibrationFilterType;
-
-private:
-  void DoInit()
-  {
-    SetName("SARRadiometricCalibration");
-    SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.\n");
-
-    // Documentation
-    SetDocName("SAR Radiometric calibration");
-    SetDocLongDescription("The objective of SAR calibration is to provide imagery in which the pixel values can be directly related to the radar backscatter of the scene. This application allows computing Sigma Naught (Radiometric Calibration) for TerraSAR-X, Sentinel1 L1 and Radarsat-2 sensors. Metadata are automatically retrieved from image products.The application supports complex and non-complex images (SLC or detected products).\n");
-    SetDocLimitations("None");
-    SetDocAuthors("OTB-Team");
-    SetDocSeeAlso(" ");
-
-    AddDocTag(Tags::Calibration);
-    AddDocTag(Tags::SAR);
-
-    AddParameter(ParameterType_ComplexInputImage,  "in", "Input Image");
-    SetParameterDescription("in", "Input complex image");
-
-    AddParameter(ParameterType_OutputImage,  "out", "Output Image");
-    SetParameterDescription("out", "Output calibrated image. This image contains the backscatter (sigmaNought) of the input image.");
-
-    AddRAMParameter();
-
-    AddParameter(ParameterType_Empty, "noise", "Disable Noise");
-    SetParameterDescription("noise", "Flag to disable noise. For 5.2.0 release, the noise values are only read by TerraSARX product.");
-    MandatoryOff("noise");
-
-    AddParameter(ParameterType_Choice, "lut", "Lookup table sigma /gamma/ beta/ DN.");
-    SetParameterDescription("lut", "Lookup table values are not available with all SAR products. Products that provide lookup table with metadata are: Sentinel1, Radarsat2.");
-    AddChoice("lut.sigma", "Use sigma nought lookup");
-    SetParameterDescription("lut.sigma","Use Sigma nought lookup value from product metadata");
-    AddChoice("lut.gamma", "Use gamma nought lookup");
-    SetParameterDescription("lut.gamma","Use Gamma nought lookup value from product metadata");
-    AddChoice("lut.beta", "Use beta nought lookup");
-    SetParameterDescription("lut.beta","Use Beta nought lookup value from product metadata");
-    AddChoice("lut.dn", "Use DN value lookup");
-    SetParameterDescription("lut.dn","Use DN value lookup value from product metadata");
-    SetDefaultParameterInt("lut", 0);
-
-    // Doc example parameter settings
-    SetDocExampleParameterValue("in", "RSAT_imagery_HH.tif");
-    SetDocExampleParameterValue("out", "SARRadiometricCalibration.tif" );
-  }
-
-  void DoUpdateParameters()
-  {
-
-  }
-
-  void DoExecute()
-  {
-    // Get the input complex image
-    ComplexFloatImageType*  floatComplexImage = GetParameterComplexFloatImage("in");
-
-    // Set the filer input
-    m_CalibrationFilter = CalibrationFilterType::New();
-    m_CalibrationFilter->SetInput(floatComplexImage);
-
-    if (IsParameterEnabled("noise"))
-      {
-      m_CalibrationFilter->SetEnableNoise(false);
-      }
-
-    short lut = 0;
-
-    lut = GetParameterInt("lut");
-
-    m_CalibrationFilter->SetLookupSelected(lut);
-
-    // Set the output image
-    SetParameterOutputImage("out", m_CalibrationFilter->GetOutput());
-
-  }
-
-  CalibrationFilterType::Pointer   m_CalibrationFilter;
-
-};
-}
-}
-
-OTB_APPLICATION_EXPORT(otb::Wrapper::SARRadiometricCalibration)

Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx

@@ -93,9 +93,6 @@ private:
 
   void DoExecute()
   {
-
-    otbAppLogINFO( << "THIS APPLICATION IS DEPRECATED AND WILL BE REMOVED IN NEXT VERSION OF OTB. PLEASE CONSIDER USING 'SARRadiometricCalibration' APPLICATION INSTEAD. SEE MANTIS - https://bugs.orfeo-toolbox.org/view.php?id=1161" );
-
     // Get the input complex image
     ComplexFloatImageType*  floatComplexImage = GetParameterComplexFloatImage("in");