GENNOISESPEC: Solved bug when I2RFITTED, runEnergy (TASKSSIRENA): Sol…

…ved bug when 0-padding and library with a large filter
bcobo · Dec 15, 2020 · aa67288 · aa67288
1 parent a8a61b3
commit aa67288
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/libsixt/integraSIRENA.cpp b/libsixt/integraSIRENA.cpp
@@ -102,7 +102,7 @@
   * - LbT: Baseline averaging length for the RS raw energy estimation (seconds)
   * - noise_file: Noise file
   * - filter_domain: Filtering Domain: Time(T) or Frequency(F)
-  * - filter_method: Filtering Method: F0 (deleting the zero frequency bin) or F0 (deleting the baseline)
+  * - filter_method: Filtering Method: F0 (deleting the zero frequency bin) or B0 (deleting the baseline)
   * - energy_method: Energy calculation Method: OPTFILT, WEIGHT, WEIGHTN, I2R, I2RFITTED or PCA
   * - filtEeV: Energy of the filters of the library to be used to calculate energy (only for OPTFILT, I2R and I2RFITTED)
   * - Ifit: Constant to apply the I2RFITTED conversion
@@ -196,8 +196,8 @@
              EP_EXIT_ERROR((char*)"Error in getLibraryCollection",EPFAIL); 
          }
 
-         double double_oflength = (double) oflength;
-         double log2_double_oflength = log2(double_oflength);            
+         //double double_oflength = (double) oflength;
+         //double log2_double_oflength = log2(double_oflength);            
          /*if ((opmode == 1) && (oflib == 1) && (strcmp(oflength_strategy,"FIXED") == 0) && ((log2_double_oflength - (int) log2_double_oflength) != 0))
          {
              EP_EXIT_ERROR("If OFLib=yes, OFLength must be a power of 2",EPFAIL);
@@ -1057,7 +1057,7 @@
   * - pulse_length: Pulse length
   * - energy_method: Energy calculation Method: OPTFILT, WEIGHT, WEIGHTN, I2R, I2RFITTED or PCA
   * - ofnoise: For optimal filtering, NSD or WEIGHTM
-  * - filter_method: Filtering Method: F0 (deleting the zero frequency bin) or F0 (deleting the baseline)
+  * - filter_method: Filtering Method: F0 (deleting the zero frequency bin) or B0 (deleting the baseline)
   * - oflib: Work or not with a library with optimal filters (1/0)
   * - ofinterp: Optimal Filter by using the Matched Filter or the DAB as matched filter (MF/DAB) 
   * 	      It has been fixed in 'tesreconstruction' as 'DAB' (but it would be possible to work with 'MF')

diff --git a/libsixt/tasksSIRENA.cpp b/libsixt/tasksSIRENA.cpp
@@ -8084,7 +8084,10 @@ resize_mf_lowres = 4;
 
                         if ((strcmp((*reconstruct_init)->FilterDomain,"T") == 0) && ((*reconstruct_init)->pulse_length < (*reconstruct_init)->OFLength)) // 0-padding 
                         {
-                            filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templates[0].template_duration);
+                            if ((*reconstruct_init)->library_collection->pulse_templates[0].template_duration < (*reconstruct_init)->library_collection->pulse_templatesMaxLengthFixedFilter[0].template_duration)
+                                filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templatesMaxLengthFixedFilter[0].template_duration);
+                            else
+                                filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templates[0].template_duration);
                         }
 
                         Pab = gsl_vector_alloc(resize_mf);
@@ -9053,7 +9056,10 @@ resize_mf_lowres = 4;
 
                         if ((strcmp((*reconstruct_init)->FilterDomain,"T") == 0) && ((*reconstruct_init)->pulse_length < (*reconstruct_init)->OFLength)) // 0-padding 
                         {
-                            filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templates[0].template_duration);
+                            if ((*reconstruct_init)->library_collection->pulse_templates[0].template_duration < (*reconstruct_init)->library_collection->pulse_templatesMaxLengthFixedFilter[0].template_duration)
+                                filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templatesMaxLengthFixedFilter[0].template_duration);
+                            else
+                                filtergsl = gsl_vector_alloc((*reconstruct_init)->library_collection->pulse_templates[0].template_duration);
                         }
 
                         Pab = gsl_vector_alloc(resize_mf);

diff --git a/libsixt/versionSIRENA.h b/libsixt/versionSIRENA.h
@@ -27,6 +27,6 @@
 #ifndef SIRENA_VERSION_H
 #define SIRENA_VERSION_H
 
-#define SIRENA_VERSION "3.7.0"
+#define SIRENA_VERSION "3.7.1"
 
 #endif
diff --git a/tools/gennoisespec/gennoisespec.cpp b/tools/gennoisespec/gennoisespec.cpp
@@ -1258,6 +1258,7 @@
                  message = "Cannot run routine convertI2R";
                  EP_EXIT_ERROR(message,EPFAIL);
              }
+             gsl_vector_scale(ioutgsl,aducnv);
          }
          else
          {