ItemizeSimulation: pass detector instead of simulation; decouple polarizers 1 and 2

GUI/Model/FromCore/ItemizeSimulation.cpp

@@ -137,9 +137,8 @@ void setMaskContainer(MaskItems* destMaskItems, const IDetector& detector, doubl
     }
 }
 
-void setDetectorMasks(DetectorItem* detector_item, const ISimulation2D& simulation)
+void setDetectorMasks(DetectorItem* detector_item, const IDetector& detector)
 {
-    const IDetector& detector = simulation.detector();
     if ((detector.detectorMask() && detector.detectorMask()->hasMasks())
         || detector.hasExplicitRegionOfInterest()) {
         const double scale = 1.0 / detector_item->axesToCoreUnitsFactor();
@@ -373,11 +372,8 @@ void setDetectorResolution(DetectorItem* detector_item, const IDetector& detecto
         ASSERT(0);
 }
 
-void setPolarizerAnalyzer(Instrument2DItem* instrument_item, const ISimulation2D& simulation)
+void setPolarizer2(Instrument2DItem* instrument_item, const IDetector& detector)
 {
-    instrument_item->setPolarization(simulation.beam().polVector());
-
-    const IDetector& detector = simulation.detector();
     double total_transmission = detector.analyzer().totalTransmission();
     if (total_transmission <= 0.0)
         return;
@@ -389,16 +385,15 @@ void setPolarizerAnalyzer(Instrument2DItem* instrument_item, const ISimulation2D
     instrument_item->setAnalyzerTotalTransmission(total_transmission);
 }
 
-void updateDetector(Instrument2DItem* instrument_item, const ISimulation2D& simulation)
+void updateDetector(Instrument2DItem* instrument_item, const IDetector& detector)
 {
-    const IDetector& detector = simulation.detector();
     setDetectorGeometry(instrument_item, detector);
 
     auto* detector_item = instrument_item->detectorItem();
 
     setDetectorResolution(detector_item, detector);
-    setDetectorMasks(detector_item, simulation);
-    setPolarizerAnalyzer(instrument_item, simulation);
+    setDetectorMasks(detector_item, detector);
+    setPolarizer2(instrument_item, detector);
 }
 
 void setBackground(InstrumentItem* instrument_item, const ISimulation& simulation)
@@ -416,7 +411,8 @@ GISASInstrumentItem* createGISASInstrumentItem(const ScatteringSimulation& simul
 {
     auto* result = new GISASInstrumentItem();
     setGISASBeamItem(result->beamItem(), simulation);
-    updateDetector(result, simulation);
+    result->setPolarization(simulation.beam().polVector());
+    updateDetector(result, simulation.detector());
 
     return result;
 }
@@ -425,7 +421,8 @@ OffspecInstrumentItem* createOffspecInstrumentItem(const OffspecSimulation& simu
 {
     auto* result = new OffspecInstrumentItem();
     setOffspecBeamItem(result->beamItem(), simulation);
-    updateDetector(result, simulation);
+    result->setPolarization(simulation.beam().polVector());
+    updateDetector(result, simulation.detector());
 
     const double factor = 1. / Units::deg;
     result->alphaAxis().setNbins(simulation.beamAxis()->size());