diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/changeresolutionaction.h b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/changeresolutionaction.h index 66358e4a69342e8c97f1f360023550efec7efc41..10b6235247992bfabe9fce5c8b683fffe4d03e41 100644 --- a/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/changeresolutionaction.h +++ b/CEP/DP3/AOFlagger/include/AOFlagger/rfi/strategy/changeresolutionaction.h @@ -63,10 +63,10 @@ namespace rfiStrategy { int _frequencyDecreaseFactor; void DecreaseTime(TimeFrequencyData &data); - void IncreaseTime(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage); + void IncreaseTime(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage, bool restoreMask); void DecreaseFrequency(TimeFrequencyData &data); - void IncreaseFrequency(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage); + void IncreaseFrequency(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage, bool restoreMask); /** * If this is true, the subtasks of this task can change the revised image, and diff --git a/CEP/DP3/AOFlagger/src/rfi/strategy/changeresolutionaction.cpp b/CEP/DP3/AOFlagger/src/rfi/strategy/changeresolutionaction.cpp index d80aa0f9d029e0741425fefbef8b179b4d597544..707d4335849718da72784fdf3ba27ff041353fc3 100644 --- a/CEP/DP3/AOFlagger/src/rfi/strategy/changeresolutionaction.cpp +++ b/CEP/DP3/AOFlagger/src/rfi/strategy/changeresolutionaction.cpp @@ -40,9 +40,9 @@ namespace rfiStrategy { PerformFrequencyChange(artifactsCopy, listener); - IncreaseTime(artifacts.OriginalData(), artifactsCopy.OriginalData(), false); - IncreaseTime(artifacts.ContaminatedData(), artifactsCopy.ContaminatedData(), false); - IncreaseTime(artifacts.RevisedData(), artifactsCopy.RevisedData(), _restoreRevised); + IncreaseTime(artifacts.OriginalData(), artifactsCopy.OriginalData(), false, false); + IncreaseTime(artifacts.ContaminatedData(), artifactsCopy.ContaminatedData(), false, _restoreMasks); + IncreaseTime(artifacts.RevisedData(), artifactsCopy.RevisedData(), _restoreRevised, _restoreMasks); if(_restoreRevised) { @@ -72,9 +72,9 @@ namespace rfiStrategy { ActionBlock::Perform(artifactsCopy, listener); - IncreaseFrequency(artifacts.OriginalData(), artifactsCopy.OriginalData(), false); - IncreaseFrequency(artifacts.ContaminatedData(), artifactsCopy.ContaminatedData(), false); - IncreaseFrequency(artifacts.RevisedData(), artifactsCopy.RevisedData(), _restoreRevised); + IncreaseFrequency(artifacts.OriginalData(), artifactsCopy.OriginalData(), false, false); + IncreaseFrequency(artifacts.ContaminatedData(), artifactsCopy.ContaminatedData(), false, _restoreMasks); + IncreaseFrequency(artifacts.RevisedData(), artifactsCopy.RevisedData(), _restoreRevised, _restoreMasks); if(_restoreRevised) { @@ -125,7 +125,7 @@ namespace rfiStrategy { } } - void ChangeResolutionAction::IncreaseTime(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage) + void ChangeResolutionAction::IncreaseTime(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage, bool restoreMask) { if(restoreImage) { @@ -139,7 +139,7 @@ namespace rfiStrategy { originalData.SetImage(i, newImage); } } - if(_restoreMasks) + if(restoreMask) { originalData.SetMask(changedData); size_t maskCount = originalData.MaskCount(); @@ -153,7 +153,7 @@ namespace rfiStrategy { } } - void ChangeResolutionAction::IncreaseFrequency(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage) + void ChangeResolutionAction::IncreaseFrequency(TimeFrequencyData &originalData, TimeFrequencyData &changedData, bool restoreImage, bool restoreMask) { if(restoreImage) { @@ -167,7 +167,7 @@ namespace rfiStrategy { originalData.SetImage(i, newImage); } } - if(_restoreMasks) + if(restoreMask) { originalData.SetMask(changedData); size_t maskCount = originalData.MaskCount();