Merge pull request #65 from preghenella/master

Allow RICH to be a forward detector

Author: preghenella

src/RICHdetector.cc

@@ -28,7 +28,15 @@ RICHdetector::hasRICH(const Track &track) const
   auto y = track.YOuter * 0.1; // [cm]
   auto z = track.ZOuter * 0.1; // [cm]
   /** check if hit **/
-  bool ishit = (fabs(hypot(x, y) - mRadius) < 0.001 && fabs(z) < mLength);
+  bool ishit = false;
+  if (mType == kBarrel) {
+    auto r = hypot(x, y);
+    ishit = (fabs(r - mRadius) < 0.001 && fabs(z) < mLength);
+  }
+  if (mType == kForward) {
+    auto r = hypot(x, y);
+    ishit = (r > mRadiusIn) && (r < mRadius) && (fabs(fabs(z) - mLength) < 0.001);
+  }
   if (!ishit) return false;
   /** check if above threshold **/
   auto particle = (GenParticle *)track.Particle.GetObject();

src/RICHdetector.hh

@@ -16,6 +16,8 @@ class RICHdetector {
 public:
   RICHdetector() = default;
   ~RICHdetector() = default;
+
+  enum { kBarrel, kForward }; // type of RICH detector
 
   void setup(float radius, float length);  
   bool hasRICH(const Track &track) const;
@@ -25,6 +27,9 @@ public:
   void setEfficiency(float val) { mEfficiency = val; };
   void setSigma(float val) { mSigma = val; };
   void setMinPhotons(int val) { mMinPhotons = val; };
+  
+  void setType(int val) { mType = val; };
+  void setRadiusIn(float val) { mRadiusIn = val; };
 
   void makePID(const Track &track, std::array<float, 5> &deltaangle, std::array<float, 5> &nsigma) const;
   std::pair<float, float> getMeasuredAngle(const Track &track) const;
@@ -42,8 +47,10 @@ public:
     return mSigma / sqrt(numberOfDetectedPhotons(cherenkovAngle(p, m))); }
 
 protected:
-  
+
+  int mType = kBarrel;
   float mRadius = 100.; // [cm]
+  float mRadiusIn = 10.; // [cm]
   float mLength = 200.; // [cm]
 
   float mIndex = 1.03;