Merge pull request #326 from rest-for-physics/jgalan_axion_field

Fixing an issue with masks not rotating
rest-for-physics · Nov 18, 2022 · 5c5291e · 5c5291e
2 parents 487a301 + 7fa1705
commit 5c5291e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/source/framework/masks/inc/TRestCombinedMask.h b/source/framework/masks/inc/TRestCombinedMask.h
@@ -43,7 +43,7 @@ class TRestCombinedMask : public TRestPatternMask {
         return fMasks[0];
     }
 
-    Int_t GetRegion(Double_t x, Double_t y) override;
+    Int_t GetRegion(Double_t& x, Double_t& y) override;
 
     void InitFromConfigFile() override;
 

diff --git a/source/framework/masks/inc/TRestGridMask.h b/source/framework/masks/inc/TRestGridMask.h
@@ -40,7 +40,7 @@ class TRestGridMask : public TRestPatternMask {
     Int_t fModulus = 10;  //<
 
    public:
-    virtual Int_t GetRegion(Double_t x, Double_t y) override;
+    virtual Int_t GetRegion(Double_t& x, Double_t& y) override;
 
     /// It returns the gap/periodicity of the grid in mm
     Double_t GetGridGap() { return fGridGap; }

diff --git a/source/framework/masks/inc/TRestPatternMask.h b/source/framework/masks/inc/TRestPatternMask.h
@@ -62,7 +62,7 @@ class TRestPatternMask : public TRestMetadata {
     Bool_t HitsPattern(Double_t x, Double_t y);
 
     /// To be implemented at the inherited class with the pattern and region identification logic
-    virtual Int_t GetRegion(Double_t x, Double_t y) {
+    virtual Int_t GetRegion(Double_t& x, Double_t& y) {
         if (ApplyCommonMaskTransformation(x, y) == 0) return 1;
         return 0;
     }

diff --git a/source/framework/masks/inc/TRestRingsMask.h b/source/framework/masks/inc/TRestRingsMask.h
@@ -48,7 +48,7 @@ class TRestRingsMask : public TRestPatternMask {
    public:
     void GenerateRings();
 
-    virtual Int_t GetRegion(Double_t x, Double_t y) override;
+    virtual Int_t GetRegion(Double_t& x, Double_t& y) override;
 
     /// It returns the gap/periodicity of the rings in mm
     Double_t GetRingsGap() { return fRingsGap; }

diff --git a/source/framework/masks/inc/TRestSpiderMask.h b/source/framework/masks/inc/TRestSpiderMask.h
@@ -47,7 +47,7 @@ class TRestSpiderMask : public TRestPatternMask {
    public:
     void GenerateSpider();
 
-    virtual Int_t GetRegion(Double_t x, Double_t y) override;
+    virtual Int_t GetRegion(Double_t& x, Double_t& y) override;
 
     /// It returns the gap/periodicity of the spider structure arms in radians
     Double_t GetArmsSeparationAngle() { return fArmsSeparationAngle; }

diff --git a/source/framework/masks/inc/TRestStrippedMask.h b/source/framework/masks/inc/TRestStrippedMask.h
@@ -40,7 +40,7 @@ class TRestStrippedMask : public TRestPatternMask {
     Int_t fModulus = 10;
 
    public:
-    virtual Int_t GetRegion(Double_t x, Double_t y) override;
+    virtual Int_t GetRegion(Double_t& x, Double_t& y) override;
 
     /// It returns the gap/periodicity of the strips in mm
     Double_t GetStripsGap() { return fStripsGap; }

diff --git a/source/framework/masks/src/TRestCombinedMask.cxx b/source/framework/masks/src/TRestCombinedMask.cxx
@@ -146,7 +146,7 @@ void TRestCombinedMask::Initialize() {
 /// The particle will be counter-rotated to emulate the mask rotation
 /// using the method TRestPatternMask::ApplyCommonMaskTransformation
 ///
-Int_t TRestCombinedMask::GetRegion(Double_t x, Double_t y) {
+Int_t TRestCombinedMask::GetRegion(Double_t& x, Double_t& y) {
     Int_t region = 0;
     for (const auto mask : fMasks) {
         Int_t id = mask->GetRegion(x, y);

diff --git a/source/framework/masks/src/TRestGridMask.cxx b/source/framework/masks/src/TRestGridMask.cxx
@@ -158,7 +158,7 @@ void TRestGridMask::Initialize() {
 /// The particle will be counter-rotated to emulate the mask offset and
 /// rotation using the method TRestPatternMask::ApplyCommonMaskTransformation
 ///
-Int_t TRestGridMask::GetRegion(Double_t x, Double_t y) {
+Int_t TRestGridMask::GetRegion(Double_t& x, Double_t& y) {
     if (TRestPatternMask::GetRegion(x, y)) return 0;
 
     Double_t xEval = fGridThickness / 2. + x;

diff --git a/source/framework/masks/src/TRestRingsMask.cxx b/source/framework/masks/src/TRestRingsMask.cxx
@@ -165,7 +165,7 @@ void TRestRingsMask::Initialize() {
 /// The particle will be counter-rotated to emulate the mask rotation
 /// using the method TRestPatternMask::RotateAndTranslate.
 ///
-Int_t TRestRingsMask::GetRegion(Double_t x, Double_t y) {
+Int_t TRestRingsMask::GetRegion(Double_t& x, Double_t& y) {
     if (TRestPatternMask::GetRegion(x, y)) return 0;
 
     Double_t r = TMath::Sqrt(x * x + y * y);

diff --git a/source/framework/masks/src/TRestSpiderMask.cxx b/source/framework/masks/src/TRestSpiderMask.cxx
@@ -167,7 +167,7 @@ void TRestSpiderMask::Initialize() {
 /// The particle will be counter-rotated to emulate the mask rotation
 /// using the method TRestPatternMask::ApplyCommonMaskTransformation
 ///
-Int_t TRestSpiderMask::GetRegion(Double_t x, Double_t y) {
+Int_t TRestSpiderMask::GetRegion(Double_t& x, Double_t& y) {
     if (TRestPatternMask::GetRegion(x, y)) return 0;
 
     Double_t d = TMath::Sqrt(x * x + y * y);

diff --git a/source/framework/masks/src/TRestStrippedMask.cxx b/source/framework/masks/src/TRestStrippedMask.cxx
@@ -160,7 +160,7 @@ void TRestStrippedMask::Initialize() {
 /// The particle will be counter-rotated to emulate the mask rotation
 /// using the method TRestPatternMask::ApplyCommonMaskTransformation
 ///
-Int_t TRestStrippedMask::GetRegion(Double_t x, Double_t y) {
+Int_t TRestStrippedMask::GetRegion(Double_t& x, Double_t& y) {
     if (TRestPatternMask::GetRegion(x, y)) return 0;
 
     Double_t xEval = fStripsThickness / 2. + x;