diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 909dda791a8204a97133a171d02ccfdce3ce0ac6..2f6fd8416e034f11ef67c0e37e79602317384dcb 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -198,7 +198,8 @@ std::string defineDetector(const ISimulation* simulation)
             throw std::runtime_error("defineDetector() -> Error. Unknown alignment.");
     } else
         throw std::runtime_error("defineDetector() -> Error. Unknown detector");
-    if (detector->regionOfInterest()) {
+    if (detector->regionOfInterest()) { // #baROI refactor: detector->hasRoi()
+        // #baROI  refactor : detector->roiCoords()
         result << indent() << "detector.setRegionOfInterest("
                << printFunc(detector)(detector->regionOfInterest()->getXlow()) << ", "
                << printFunc(detector)(detector->regionOfInterest()->getYlow()) << ", "
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index be41d608534392dc22840799d6ba9c277afae9b6..961681b8562c2865ad4a7efe3354e390df32a2e0 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -79,9 +79,11 @@ public:
     //! Calculate axis index for given global index
     size_t axisBinIndex(size_t index, size_t selected_axis) const;
 
-    //! Returns total number of pixels
+    //! Returns total number of pixels // #baROI rename to totalPixels
     size_t totalSize() const;
 
+    // #baROI add roiPixels; docu: same as totalPixels if no roi set
+
     //! Applies the detector resolution to the given intensity maps
     void applyDetectorResolution(OutputData<double>* p_intensity_map) const;
 
diff --git a/Device/Detector/RectangularDetector.cpp b/Device/Detector/RectangularDetector.cpp
index 517ffed8a0ba9d1fa0937e1ef318aad287596f3a..db602c91555cb30384142cea7dd59922d09510f8 100644
--- a/Device/Detector/RectangularDetector.cpp
+++ b/Device/Detector/RectangularDetector.cpp
@@ -166,7 +166,8 @@ RectangularPixel* RectangularDetector::regionOfInterestPixel() const
     const IAxis& u_axis = axis(0);
     const IAxis& v_axis = axis(1);
     double u_min, v_min, width, height;
-    auto p_roi = regionOfInterest();
+    auto p_roi =
+        regionOfInterest(); // #baROI refactor: return x1/y1/x2/y2 instead of class RegionOfInterest
     if (p_roi) {
         u_min = p_roi->getXlow();
         v_min = p_roi->getYlow();
diff --git a/Device/Detector/SimulationArea.cpp b/Device/Detector/SimulationArea.cpp
index 30dee02d6dc57833fe6165259149a1eeb8be3635..9476d5c4e870251e7432d2f4a9dd6b111590b0d2 100644
--- a/Device/Detector/SimulationArea.cpp
+++ b/Device/Detector/SimulationArea.cpp
@@ -29,6 +29,7 @@ SimulationArea::SimulationArea(const IDetector* detector) : m_detector(detector)
         throw std::runtime_error(
             "SimulationArea::SimulationArea: detector of unspecified dimensionality");
 
+    // #baROI refactor: create method m_detector->roiPixels()
     if (m_detector->regionOfInterest())
         m_max_index = m_detector->regionOfInterest()->roiSize();
     else
@@ -53,6 +54,7 @@ bool SimulationArea::isMasked(size_t index) const
 
 size_t SimulationArea::detectorIndex(size_t index) const
 {
+    // #baROI create method m_detector->roiIndex()
     if (!m_detector->regionOfInterest())
         return index;
 
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index ae36b5721cc19ddc1add6f43595cf973e510152e..3acffdc4a192021ede3bd182a35157f1d7308b09 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -77,7 +77,7 @@ void setDistribution(BeamDistributionItem* item, ParameterDistribution par_distr
 void addDistributionToBeamItem(ParameterDistribution::WhichParameter which,
                                BeamDistributionItem* item,
                                const ParameterDistribution& distribution);
-    
+
 void addRangedDistributionToItem(SessionItem* item, const IRangedDistribution& ranged, double mean,
                                  double std_dev);
 } // namespace
@@ -226,11 +226,9 @@ void TransformFromDomain::setGISASBeamItem(BeamItem* beam_item, const GISASSimul
         addDistributionToBeamItem(ParameterDistribution::BeamWavelength,
                                   beam_item->wavelengthItem(), distributions[i]);
         addDistributionToBeamItem(ParameterDistribution::BeamInclinationAngle,
-                                  beam_item->inclinationAngleItem(),
-                                  distributions[i]);
+                                  beam_item->inclinationAngleItem(), distributions[i]);
         addDistributionToBeamItem(ParameterDistribution::BeamAzimuthalAngle,
-                                  beam_item->azimuthalAngleItem(),
-                                  distributions[i]);
+                                  beam_item->azimuthalAngleItem(), distributions[i]);
     }
 
     // polarization parameters
@@ -272,15 +270,15 @@ void TransformFromDomain::setSpecularBeamItem(SpecularBeamItem* beam_item,
     if (!resolution->empty()) {
         double mean = scan->wavelength();
         double std_dev = resolution->stdDevs(mean, 1).front();
-        addRangedDistributionToItem(beam_item->wavelengthItem(),
-                                    *resolution->distribution(), mean, std_dev);
+        addRangedDistributionToItem(beam_item->wavelengthItem(), *resolution->distribution(), mean,
+                                    std_dev);
     }
 
     resolution = scan->angleResolution();
     if (resolution && !resolution->empty()) {
         double std_dev = resolution->stdDevs(0.0, 1).front();
-        addRangedDistributionToItem(beam_item->inclinationAngleItem(),
-                                    *resolution->distribution(), 0.0, std_dev);
+        addRangedDistributionToItem(beam_item->inclinationAngleItem(), *resolution->distribution(),
+                                    0.0, std_dev);
     }
 }
 
@@ -442,7 +440,7 @@ void TransformFromDomain::setDetectorMasks(DetectorItem* detector_item,
 {
     const IDetector* detector = simulation.instrument().getDetector();
     if ((detector->detectorMask() && detector->detectorMask()->numberOfMasks())
-        || detector->regionOfInterest()) {
+        || detector->regionOfInterest()) { // #baROI refactor: hasRegionOfInterest()
         detector_item->createMaskContainer();
 
         double scale(1.0);