SIRENA update (v.3.8.36)

- Solved bug: Did not read ADU_CNV...from the FITS file if I2RDER
bcobo · Nov 22, 2022 · 0005132 · 0005132
1 parent 21690ed
commit 0005132
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/libsixt/integraSIRENA.cpp b/libsixt/integraSIRENA.cpp
@@ -508,7 +508,7 @@
          reconstruct_init->i2rdata->L = -999;
          reconstruct_init->i2rdata->Ifit = reconstruct_init->Ifit;
          //if (strcmp(reconstruct_init->EnergyMethod,"OPTFILT") != 0)
-         if ((strcmp(reconstruct_init->EnergyMethod,"I2R") == 0) || (strcmp(reconstruct_init->EnergyMethod,"I2RFITTED") == 0) || (strcmp(reconstruct_init->EnergyMethod,"I2R") == 0))
+         if ((strcmp(reconstruct_init->EnergyMethod,"I2R") == 0) || (strcmp(reconstruct_init->EnergyMethod,"I2RFITTED") == 0) || (strcmp(reconstruct_init->EnergyMethod,"I2RDER") == 0))
          {
              char extname[20];
              char keyname[10];

diff --git a/libsixt/tasksSIRENA.cpp b/libsixt/tasksSIRENA.cpp
@@ -7903,6 +7903,9 @@ int convertI2R (char* EnergyMethod,double Ibias, double Imin, double Imax, doubl
         // It is not necessary to check the allocation beacuse 'invector' size must be > 0
         gsl_vector_memcpy(I,*invector);
 
+        /*cout<<"ADU_CNV: "<<ADU_CNV<<endl;
+        cout<<"ADU_BIAS: "<<ADU_BIAS<<endl;
+        cout<<"I_BIAS: "<<I_BIAS<<endl;*/
         if (ADU_CNV == -999)
         {
             // I = ADC*aducnv+IMIN

diff --git a/libsixt/versionSIRENA.h b/libsixt/versionSIRENA.h
@@ -22,11 +22,11 @@
 //   CANTABRIA (CSIC-UC) with funding from the Spanish Ministry of Science and 
 //   Innovation (MICINN)
 //
-//   DATE: 2022/11/22, 11:05:32
+//   DATE: 2022/11/22, 12:14:17
 
 #ifndef SIRENA_VERSION_H
 #define SIRENA_VERSION_H
 
-#define SIRENA_VERSION "3.8.35"
+#define SIRENA_VERSION "3.8.36"
 
 #endif