added pass through s11
This commit is contained in:
@@ -74,8 +74,8 @@ auto DataPreprocessor::preprocess_collection(const ipc::RawSweepCollection& raw_
|
||||
|
||||
for (const auto& raw_trace : raw_collection.traces) {
|
||||
// Pipeline order is fixed: calibration first, then reference subtraction.
|
||||
const auto calibrated = calibration_master_.apply(raw_trace);
|
||||
const auto referenced = reference_master_.apply(calibrated);
|
||||
const auto calibrated = calibration_master_.apply_to_trace(raw_trace);
|
||||
const auto referenced = reference_master_.apply_to_trace(calibrated);
|
||||
preprocessed.traces.push_back(referenced);
|
||||
}
|
||||
|
||||
|
||||
@@ -62,12 +62,20 @@ int main(int argc, char** argv) {
|
||||
);
|
||||
|
||||
// Load preprocessing assets once before entering run loop.
|
||||
radar::preprocessing::CalibrationMaster calibration_master(radar::preprocessing::make_through_calibrator());
|
||||
calibration_master.load_bundle(config.preprocess.calibration_bundle_path);
|
||||
radar::preprocessing::CalibrationMaster calibration_master(
|
||||
radar::preprocessing::make_s21_through_calibrator()
|
||||
);
|
||||
calibration_master.load_s21_calibration_bundle(config.preprocess.s21_calibration_bundle_path);
|
||||
calibration_master.load_s11_calibration_bundle(
|
||||
config.preprocess.s11_open_calibration_bundle_path,
|
||||
config.preprocess.s11_short_calibration_bundle_path,
|
||||
config.preprocess.s11_load_calibration_bundle_path
|
||||
);
|
||||
|
||||
radar::preprocessing::ReferenceMaster reference_master;
|
||||
reference_master.load_bundle(config.preprocess.reference_bundle_path);
|
||||
reference_master.prepare_calibrated(calibration_master);
|
||||
reference_master.load_s21_reference_bundle(config.preprocess.s21_reference_bundle_path);
|
||||
reference_master.load_s11_reference_bundle(config.preprocess.s11_reference_bundle_path);
|
||||
reference_master.prepare_calibrated(calibration_master, config.run_combos);
|
||||
|
||||
radar::preprocessing::DataPreprocessor preprocessor(
|
||||
config,
|
||||
|
||||
Reference in New Issue
Block a user