diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h index 477b2c81fd7f5472c8d83a2538c458f33f308c26..ac6f17ad7c117abf6b959f4554173dc14a19e9c6 100644 --- a/Device/Detector/IDetector.h +++ b/Device/Detector/IDetector.h @@ -197,10 +197,6 @@ public: //! No matter whether masked or not. SimulationAreaIterator endRegionOfInterestPoints() const; - //! The axes of the complete detector. - //! Any region of interest is not taken into account. - const OwningVector<IAxis>& axes() const { return m_axes; } - //! Returns empty detector map in given axes units. //! This map is a data array limited to the size of the "Region of interest" std::unique_ptr<Powerfield<double>> createDetectorMap() const; diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i index 568bbd2a525c181073f07de53230aa097998db96..25023950ce4a89d3221d4bb24244a208f6792d89 100644 --- a/auto/Wrap/doxygenDevice.i +++ b/auto/Wrap/doxygenDevice.i @@ -915,7 +915,7 @@ Creates Powerfield array in converter units. Abstract detector interface. Handles also \"region of interest\" (ROI). In general, the ROI is the whole detector, and all methods related to ROI work on the whole detector. If a ROI different to the detector size is explicitly set, then ROI-related methods work on this reduced ROI. Therefore, when calling ROI related methods, the distinction between \"explicit -ROI exists: yes/no\" does not have to be made by the caller, but it is handled in here. For access to the whole detector, even if a smaller ROI is explicitly defined, use the non-ROI-related methods like totalSize() or axes(). Any method which is not speaking of \"explicit ROI\" handles the \"implicit ROI\", i.e. uses an explicitly set ROI or the whole detector if no explicit ROI exists. To access the explicitly set ROI, use the methods which have the explicit in its name, like sizeOfExplicitRegionOfInterest(). +ROI exists: yes/no\" does not have to be made by the caller, but it is handled in here. For access to the whole detector, even if a smaller ROI is explicitly defined, use the non-ROI-related methods like totalSize() or axes(). Any method which is not speaking of \"explicit ROI\" handles the \"implicit ROI\", i.e. uses an explicitly set ROI or the whole detector if no explicit ROI exists. To access the explicitly set ROI, use the methods which have the explicit in its name, like sizeOfExplicitRegionOfInterest(). C++ includes: IDetector.h "; @@ -1117,11 +1117,6 @@ Create begin-iterator to iterate over all points which lay within the \"Region o Create end-iterator to iterate over all points which lay within the \"Region of Interest\". If no region of interest is explicitly defined, then the whole detector is taken as \"region of interest\". No matter whether masked or not. "; -%feature("docstring") IDetector::axes "const OwningVector<IAxis>& IDetector::axes() const - -The axes of the complete detector. Any region of interest is not taken into account. -"; - %feature("docstring") IDetector::createDetectorMap "std::unique_ptr< Powerfield< double > > IDetector::createDetectorMap() const Returns empty detector map in given axes units. This map is a data array limited to the size of the \"Region of interest\" diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py index 41063b19d583e5515ef6281d436289c10fe7dcd4..9f70560ebbff764c5b5d7605abddcaef79b8f9df 100644 --- a/auto/Wrap/libBornAgainDevice.py +++ b/auto/Wrap/libBornAgainDevice.py @@ -3506,7 +3506,7 @@ class IDetector(libBornAgainBase.ICloneable, libBornAgainParam.INode): Abstract detector interface. Handles also "region of interest" (ROI). In general, the ROI is the whole detector, and all methods related to ROI work on the whole detector. If a ROI different to the detector size is explicitly set, then ROI-related methods work on this reduced ROI. Therefore, when calling ROI related methods, the distinction between "explicit - ROI exists: yes/no" does not have to be made by the caller, but it is handled in here. For access to the whole detector, even if a smaller ROI is explicitly defined, use the non-ROI-related methods like totalSize() or axes(). Any method which is not speaking of "explicit ROI" handles the "implicit ROI", i.e. uses an explicitly set ROI or the whole detector if no explicit ROI exists. To access the explicitly set ROI, use the methods which have the explicit in its name, like sizeOfExplicitRegionOfInterest(). + ROI exists: yes/no" does not have to be made by the caller, but it is handled in here. For access to the whole detector, even if a smaller ROI is explicitly defined, use the non-ROI-related methods like totalSize() or axes(). Any method which is not speaking of "explicit ROI" handles the "implicit ROI", i.e. uses an explicitly set ROI or the whole detector if no explicit ROI exists. To access the explicitly set ROI, use the methods which have the explicit in its name, like sizeOfExplicitRegionOfInterest(). C++ includes: IDetector.h