diff --git a/doc/SIRENA.rst b/doc/SIRENA.rst index 1984c02..efa0a11 100755 --- a/doc/SIRENA.rst +++ b/doc/SIRENA.rst @@ -1,6 +1,5 @@ .. _SIRENA: - .. role:: pageblue .. role:: red @@ -649,7 +648,7 @@ The SIRENA input parameter that controls the reconstruction method applied is :o .. math:: - \frac{R}{R0} = \mathit{1} - \left(\frac{abs(\Delta I)/\mathit{I0\_START}}{1 + abs(\Delta I)/\mathit{I0\_START}}\right) + \frac{R}{R0} = {\mathit{1} - \left(\frac{abs(\Delta I)/\mathit{I0\_START}}{1 + abs(\Delta I)/\mathit{I0\_START}}\right)}·10^5 * **I2RFITTED** transformation @@ -657,7 +656,7 @@ The SIRENA input parameter that controls the reconstruction method applied is :o .. math:: - \frac{R}{V0} = -\frac{1}{(I_{fit} + ADC)} + \frac{R}{V0} = -10^5\frac{1}{(I_{fit} + ADC)} .. If the *Group 1* info is available in the input FITS file: @@ -669,6 +668,8 @@ The SIRENA input parameter that controls the reconstruction method applied is :o .. These values for :math:`I_{fit}` are a first approach, although it should be confirmed after the instrument calibration. The :math:`I_{fit}` value is tunable for the moment as an input parameter. + +The :math:`10^5` scaling factor has been included in the quasi resistance space (both **I2R** and **I2RFITTED** transformations) to avoid rounding errors when working with very small numbers. diff --git a/doc/SIRENAfunctions.rst b/doc/SIRENAfunctions.rst index 928e3b1..ce6c46f 100755 --- a/doc/SIRENAfunctions.rst +++ b/doc/SIRENAfunctions.rst @@ -872,13 +872,11 @@ Search functions by name at :ref:`genindex`. - Conversion according to :option:`EnergyMethod` = **I2R**: - :math:`DeltaI = I` :math:`R/R0 = 1 - (abs(DeltaI)/I\_BIAS)/(1+abs(DeltaI)/I\_BIAS)` + :math:`DeltaI = I` :math:`R/R0 = [1 - (abs(DeltaI)/I\_BIAS)/(1+abs(DeltaI)/I\_BIAS)]\cdot10^5` - Conversion according to :option:`EnergyMethod` = **I2RFITTED**: - .. :math:`R/V0 = -1/(I_{fit}+ADC)` being :math:`I_{fit}` = ``ADU_BIAS`` - - :math:`R/V0 = -1/(I_{fit}+ADC)` being :math:`I_{fit}` value an input parameter + :math:`R/V0 = -10^5/(I_{fit}+ADC)` being :math:`I_{fit}` value an input parameter If the ``ADU_CNV`` keyword is NOT in the input FITS file and :cpp:member:`invector` contains the **ADC** column data from the input FITS file: @@ -889,13 +887,13 @@ Search functions by name at :ref:`genindex`. - Conversion according to :option:`EnergyMethod` = **I2R**: - :math:`DeltaI = I` :math:`R/R0 = 1 - (abs(DeltaI)/I0\_START)/(1+abs(DeltaI)/I0\_START)` + :math:`DeltaI = I` :math:`R/R0 = {1 - (abs(DeltaI)/I0\_START)/(1+abs(DeltaI)/I0\_START)}\cdot10^5` - Conversion according to :option:`EnergyMethod` = **I2RFITTED** - - .. :math:`R/V0 = -1/(I_{fit}+ADC)` being :math:`I_{fit}=I0\_START(adu)=I0\_START(A)/aducnv(A/adu)` - :math:`R/V0 = -1/(I_{fit}+ADC)` being :math:`I_{fit}` value an input parameter + :math:`R/V0 = -10^5/(I_{fit}+ADC)` being :math:`I_{fit}` value an input parameter + + The :math:`10^5` scaling factor has been included in the quasi resistance space (both **I2R** and **I2RFITTED** transformations) to avoid rounding errors when working with very small numbers. **Members/Variables** diff --git a/doc/_build/html/SIRENA.html b/doc/_build/html/SIRENA.html index 7f19668..30a28ef 100644 --- a/doc/_build/html/SIRENA.html +++ b/doc/_build/html/SIRENA.html @@ -574,7 +574,7 @@

Files

I = ADC * aducnv + IMIN

\Delta I= \mathit{I} - I0_START

-

\frac{R}{R0} = \mathit{1} - \left(\frac{abs(\Delta I)/\mathit{I0\_START}}{1 + abs(\Delta I)/\mathit{I0\_START}}\right)

+

\frac{R}{R0} = {\mathit{1} - \left(\frac{abs(\Delta I)/\mathit{I0\_START}}{1 + abs(\Delta I)/\mathit{I0\_START}}\right)}·10^5

@@ -583,9 +583,13 @@

Files

Looking for a simple transformation that would produce also a linear gain scale, a new transformation I2RFITTED has been proposed in [Peille+16].

-

\frac{R}{V0} = -\frac{1}{(I_{fit} + ADC)}

+

\frac{R}{V0} = -10^5\frac{1}{(I_{fit} + ADC)}

The I_{fit} value is tunable for the moment as an input parameter.

+
+ + +

The 10^5 scaling factor has been included in the quasi resistance space (both I2R and I2RFITTED transformations) to avoid rounding errors when working with very small numbers.

@@ -594,9 +598,6 @@

Files

- - -

Two experimental approaches: adding a preBuffer or 0-padding

diff --git a/doc/_build/html/SIRENAfunctions.html b/doc/_build/html/SIRENAfunctions.html index a4b5eee..69b0533 100644 --- a/doc/_build/html/SIRENAfunctions.html +++ b/doc/_build/html/SIRENAfunctions.html @@ -653,10 +653,14 @@

SIRENA functionsEnergyMethod = I2R:

-

DeltaI = I R/R0 = 1 - (abs(DeltaI)/I\_BIAS)/(1+abs(DeltaI)/I\_BIAS)

+

DeltaI = I R/R0 = [1 - (abs(DeltaI)/I\_BIAS)/(1+abs(DeltaI)/I\_BIAS)]\cdot10^5

+
+ +

  • Conversion according to EnergyMethod = I2RFITTED:

    +
    +

    R/V0 = -10^5/(I_{fit}+ADC) being I_{fit} value an input parameter

    • -

  • Conversion according to EnergyMethod = I2RFITTED:

    • If the ADU_CNV keyword is NOT in the input FITS file and invector contains the ADC column data from the input FITS file:

    @@ -666,16 +670,17 @@

    SIRENA functionsEnergyMethod = I2R:

    -

    DeltaI = I R/R0 = 1 - (abs(DeltaI)/I0\_START)/(1+abs(DeltaI)/I0\_START)

    +

    DeltaI = I R/R0 = {1 - (abs(DeltaI)/I0\_START)/(1+abs(DeltaI)/I0\_START)}\cdot10^5

  • Conversion according to EnergyMethod = I2RFITTED

    -

    R/V0 = -1/(I_{fit}+ADC) being I_{fit} value an input parameter

    +

    R/V0 = -10^5/(I_{fit}+ADC) being I_{fit} value an input parameter

    • +

    The 10^5 scaling factor has been included in the quasi resistance space (both I2R and I2RFITTED transformations) to avoid rounding errors when working with very small numbers.

    Members/Variables

    char* EnergyMethod