Merge branch 'master' into polar

Arthur Glowacki · Arthur Glowacki · commit 1664a4c38bf9 · 2025-08-05T14:53:30.000-05:00
diff --git a/src/core/process_streaming.h b/src/core/process_streaming.h
@@ -73,7 +73,15 @@ DLL_EXPORT data_struct::Stream_Block<T_real>* proc_spectra_block( data_struct::S
         {
             stream_block->fitting_blocks[itr.first].fit_counts[el_itr.first] = counts_dict[el_itr.first] / stream_block->spectra->elapsed_livetime();
         }
-        stream_block->fitting_blocks[itr.first].fit_counts[STR_NUM_ITR] = counts_dict[STR_NUM_ITR];
+        if(counts_dict.count(STR_NUM_ITR) > 0)
+        {
+            stream_block->fitting_blocks[itr.first].fit_counts[STR_NUM_ITR] = counts_dict[STR_NUM_ITR];
+        }
+        if(counts_dict.count(STR_RESIDUAL) > 0)
+        {
+            stream_block->fitting_blocks[itr.first].fit_counts[STR_RESIDUAL] = counts_dict[STR_RESIDUAL];
+        }
+        stream_block->fitting_blocks[itr.first].fit_counts[STR_TOTAL_FLUORESCENCE_YIELD] = stream_block->spectra->sum() / stream_block->spectra->elapsed_livetime();
     }
     return stream_block;
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,15 @@ DLL_EXPORT data_struct::Stream_Block<T_real>* proc_spectra_block( data_struct::S`
`73`	`73`	`{`
`74`	`74`	`stream_block->fitting_blocks[itr.first].fit_counts[el_itr.first] = counts_dict[el_itr.first] / stream_block->spectra->elapsed_livetime();`
`75`	`75`	`}`
`76`		`- stream_block->fitting_blocks[itr.first].fit_counts[STR_NUM_ITR] = counts_dict[STR_NUM_ITR];`
	`76`	`+ if(counts_dict.count(STR_NUM_ITR) > 0)`
	`77`	`+ {`
	`78`	`+ stream_block->fitting_blocks[itr.first].fit_counts[STR_NUM_ITR] = counts_dict[STR_NUM_ITR];`
	`79`	`+ }`
	`80`	`+ if(counts_dict.count(STR_RESIDUAL) > 0)`
	`81`	`+ {`
	`82`	`+ stream_block->fitting_blocks[itr.first].fit_counts[STR_RESIDUAL] = counts_dict[STR_RESIDUAL];`
	`83`	`+ }`
	`84`	`+ stream_block->fitting_blocks[itr.first].fit_counts[STR_TOTAL_FLUORESCENCE_YIELD] = stream_block->spectra->sum() / stream_block->spectra->elapsed_livetime();`
`77`	`85`	`}`
`78`	`86`	`return stream_block;`
`79`	`87`	`}`