Fadc250 sample mode. Don't return extra sample when count is odd.

JeffersonLab · Feb 10, 2021 · e803fc4 · e803fc4
1 parent 5942feb
commit e803fc4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hana_decode/Fadc250Module.cxx b/hana_decode/Fadc250Module.cxx
@@ -837,7 +837,9 @@ namespace Decoder {
 	  PopulateDataVector(fPulseData[fadc_data.chan].samples, sample_1); // Sample 1
 	  fadc_data.invalid_samples |= invalid_1;                        // Invalid samples
 	  fadc_data.overflow = (sample_1 >> 12) & 0x1;                   // Sample 1 overflow bit
-	  if((sample_1 + 2) == fadc_data.win_width && invalid_2) break;  // Skip last sample if flagged as invalid
+	  if(invalid_2) { // Skip last sample if not expected and flagged as invalid
+	    if(fPulseData[fadc_data.chan].samples.size() == fadc_data.win_width) break;
+	  }
 
 	  PopulateDataVector(fPulseData[fadc_data.chan].samples, sample_2); // Sample 2
 	  fadc_data.invalid_samples |= invalid_2;                        // Invalid samples
@@ -889,7 +891,9 @@ namespace Decoder {
 	  PopulateDataVector(fPulseData[fadc_data.chan].samples, sample_1);  // Sample 1
 	  fadc_data.invalid_samples |= invalid_1;                         // Invalid samples
 	  fadc_data.overflow = (sample_1 >> 12) & 0x1;                    // Sample 1 overflow bit
-	  if ((sample_1 + 2) == fadc_data.win_width && invalid_2) break;  // Skip last sample if flagged as invalid
+	  if(invalid_2) { // Skip last sample if not expected and flagged as invalid
+	    if(fPulseData[fadc_data.chan].samples.size() == fadc_data.win_width) break;
+	  }
 
 	  PopulateDataVector(fPulseData[fadc_data.chan].samples, sample_2);  // Sample 2
 	  fadc_data.invalid_samples |= invalid_2;                         // Invalid samples