Unverified Commit a55cd039 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Adds new dark current correction for hical (#4503) 



* First commit of new file, "ZeroDarkRate.h" modeled after "ZeroDark.h" to introduce new algorithm for correcting for dark rate.

* Updated main.cpp and hical.XXXX.conf to enable use of the new module, ZeroDarkRate.h.

* Made changes to filenames and updated documentation about new module ZeroDarkRate.h

* Fixed a typo in the number of rows of the CSV files.

* Added logic to bail out with a user error if both ZeroDark and ZeroDarkRate are active in the
configuration file.

* Compiling and applying

* Changed temp to double

* Moved to a callable

* Updated gain call

* Swapped to use callable

* Moved to gtest

* Removed old app tests

* Moved dark rate test to gtest

* Changelog

* Updated hical docs

* Fixed comment tabbing

Co-authored-by: default avatarOther Orb / Moses Milazzo <moses@otherorb.net>
parent 53f4ac76

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ release. 


## [Unreleased]



### Added

- Added a new dark current correction to hical that works with the higher temperatures recent images are captured at. Use the new config file, $ISISDATA/mro/calibration/hical.0023_darkrate.conf, to enable the new dark current correction over the old dark current correction. Runs of hical without the new dark current correction will also produce an extra line in the output log indicating that the ZeroDarkRate module is disabled. [#4324](https://github.com/USGS-Astrogeology/ISIS3/issues/4324)



### Changed

- isisVarInit.py no longer writes a "cat" statement by default to the activate scripts which cause the ISIS version information to be written on conda activate.  This can be included in those scripts via a command line option to isisVarInit.py.  Also, a quiet option is provided to isisVarInit.py to suppress its own writing to standard out, if needed.

isis/src/mro/apps/hical/assets/hical.XXXX.conf

+11 −0
Original line number Diff line number Diff line
@@ -140,6 +140,17 @@ Object = Hical 
    ZeroDarkFilterIterations = 1

  End_Group



/* This profile contains parameters pertinent to processing dark current with the new module. */

/* Required label keywords:  Summing, Tdi, FpaPositiveYTemperature, */

/*                           and FpaNegativeYTemperature, Lines, ADC settings */

  Group = Profile

    Name = ZeroDarkRate

    Module = ZeroDarkRate



    DarkCoeffs = "$mro/calibration/matrices/darkrate/DarkRate_{CCD}_{CHANNEL}_TDI{TDI}_BIN{BIN}_ADC{adc}_hical_????.csv"



  End_Group



/* This profile contains parameters pertinent to processing the nonlinear gain correction */

  Group = Profile

    Name = GainNonLinearity

isis/src/mro/apps/hical/hical.cpp

0 → 100644
+529 −0

File added.

Preview size limit exceeded, changes collapsed.

isis/src/mro/apps/hical/hical.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef hical_h

#define hical_h



/** This is free and unencumbered software released into the public domain.



The authors of ISIS do not claim copyright on the contents of this file.

For more details about the LICENSE terms and the AUTHORS, you will

find files of those names at the top level of this repository. **/



/* SPDX-License-Identifier: CC0-1.0 */



#include "Pvl.h"

#include "UserInterface.h"



namespace Isis {

  extern void hical(UserInterface &ui, Pvl *log=nullptr);

}



#endif
 
 No newline at end of file

isis/src/mro/apps/hical/hical.xml

+536 −495

File changed.

Preview size limit exceeded, changes collapsed.