Skip to content
Snippets Groups Projects
Commit cc59f166 authored by psainvit's avatar psainvit
Browse files

TSU-4211 GM_Align_Polar Changing extension not update offsets in meas table

parent 8b6cbfbd
Branches
Tags CastorScript-03-00-04
1 merge request!1253TSU-4211 GM_Align_Polar Changing extension not update offsets in meas table
Pipeline #12338157 passed
...@@ -96,10 +96,11 @@ namespace TSU.Common.Compute.Compensations.BeamOffsets ...@@ -96,10 +96,11 @@ namespace TSU.Common.Compute.Compensations.BeamOffsets
if (compute.ObservationType == observationType) if (compute.ObservationType == observationType)
{ {
compute.Obsolete = true; compute.Obsolete = true;
foreach (var measure in compute.Measures) if (compute.Measures != null)
{ foreach (var measure in compute.Measures)
this.ObsoleteMeasures.Add(measure); {
} this.ObsoleteMeasures.Add(measure);
}
} }
} }
} }
......
...@@ -1221,6 +1221,7 @@ namespace TSU.Polar.GuidedModules.Steps ...@@ -1221,6 +1221,7 @@ namespace TSU.Polar.GuidedModules.Steps
var measureModelForNextOnes = st.MeasuresToDo.LastOrDefault(x => x._Name.Contains(measure._Point._Name)) as Measure; var measureModelForNextOnes = st.MeasuresToDo.LastOrDefault(x => x._Name.Contains(measure._Point._Name)) as Measure;
var extensionBeforePossibleModification = measureModelForNextOnes.Extension.Value; var extensionBeforePossibleModification = measureModelForNextOnes.Extension.Value;
stmv.ChangeExtension(measureModelForNextOnes.Extension, forceMeasureToModify: measureModelForNextOnes); stmv.ChangeExtension(measureModelForNextOnes.Extension, forceMeasureToModify: measureModelForNextOnes);
stm.OnMeasureReceived(null, new M.MeasurementEventArgs() { JustMeasured = measure });
if (choice == R.T_BOTH && measureModelForNextOnes.Extension.Value != extensionBeforePossibleModification) if (choice == R.T_BOTH && measureModelForNextOnes.Extension.Value != extensionBeforePossibleModification)
measure.Extension = measureModelForNextOnes.Extension.Clone() as DoubleValue; measure.Extension = measureModelForNextOnes.Extension.Clone() as DoubleValue;
MoveToGoodStep(measure._Point._Name, gm); MoveToGoodStep(measure._Point._Name, gm);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment