WebSVN – f9daq – Diff – /lightguide/trunk/include/guide.h

 #define MARGIN 1.0e-6
 #define DEGREE 180.0/3.14159265358979312
+#define MAX_REFLECTIONS 19
 using namespace TMath;
 const double c_reflectivity = 0.96;
 const int REFRACTION = 1;
 const int REFLECTION = 2;
 const int TOTAL = 3;
+const int ABSORBED = -2;
 const TVector3 CENTER(-2.0, 0.0, 0.0);
 const int nch = 50; // number of "channels" used as number of bins in histograms
-enum Fate {missed=0, hit=1, refracted=-1, ok=2, noreflection=-2, backreflected=-3, rays=3, absorbed=4};
+enum Fate {missed=0, hitExit=1, refracted=-1, enter=2, noreflection=-2, backreflected=-3, rays=3, absorbed=4};
 int dbg = 0;
 //=================================================================================
 // zarek (premica)
 //#define SURF_TOTAL 1
 #define SURF_IMPER 4
 //#define SURF_DIFUS 5
 class CSurface : public CPlane4
 {
 public:
         CSurface(int type0 = 0);
         CSurface(int type0, TVector3 r1, TVector3 r2, TVector3 r3, TVector3 r4,
                          double n10, double n20, double reflectivity);
         CSurface(int type0, TVector3 *vr,  double n10, double n20, double reflectivity);
         void SetV(TVector3 *vr){CPlane4::Set(vr);};
         void SetType(int type0){type = type0;};
         void SetIndex(double n10, double n20);
         void SetReflection(double reflectivity){reflection = reflectivity;};
         void SetFresnel(int f = 1) {fresnel = f;};
         TRandom rand; // za racunanje verjetnosti odboja od zrcala
         double cosTtotal; //cosinus mejnega kota totalnega odboja za dana n1 in n2
         int fresnel; // ali naj uposteva Fresnelove enacbe
 };
 //=================================================================================
 //=================================================================================
 //    +-------   n1
 //    |       -------
 //    |          n2  ----+
 //    |       ------R
 //    +-------
 //    <-------- d ------->
 //
-#define VODNIK_MAX_ODB 19
 int RCol(int col, int solid);
 class DetectorParameters
 {
 public:
   DetectorParameters(double a, double b, double d, double active, double n1, double n2, double n3, TVector3 gap):
   _a(a),
   _b(b),
   _d(d),
   _active(active),
   _plateWidth(1),
   _fresnel(1),
   _glassOn(0),
   _glassD(0),
   _guideOn(1),
-  _plateOn(1)
+  _plateOn(1),
+  offsetY(2.5),
+  offsetZ(2.5)
   {};
   DetectorParameters(double a, double b, double d):
   _a(a),
   _b(b),
   _d(d),
   _plateWidth(1),
   _fresnel(1),
   _glassOn(0),
   _glassD(0),
   _guideOn(1),
-  _plateOn(1)
+  _plateOn(1),
+  offsetY(2.5),
+  offsetZ(2.5)
   {};
   ~DetectorParameters() {};
   void setGuide(double a, double b, double d, double n1, double n2, double n3) {
     _a = a;
   int getFresnel() { return _fresnel; };
   int getGlassOn() { return _glassOn; };
   double getGlassD() { return _glassD; };
   int getGuideOn() { return _guideOn; };
   int getPlateOn() { return _plateOn; };
+  double getOffsetY() { return offsetY; };
+  double getOffsetZ() { return offsetZ; };
 private:
   double _a;
   double _b;
   double _d;
   double _n1;
   double _n2;
   double _n3;
   TVector3 _gap;
   double _plateWidth;
+  double offsetY;
+  double offsetZ;
   int _fresnel;
   int _glassOn;
   double _glassD;
   int _guideOn;
 class Guide
+{
 public:
         Guide(TVector3 center0, DetectorParameters& parameters);
         ~Guide() {
-        //delete [] s_side; // problematic -> dangling references, needs solution
+          for (int jk=0; jk<6; jk++) delete s_side[jk];
-        delete hfate;
+          delete hfate;
-        delete hnodb_all;
+          delete hnodb_all;
-        delete hnodb_exit;
+          delete hnodb_exit;
-        delete hin;
+          delete hin;
-        delete hout;
+          delete hout;
+        }
         Fate PropagateRay(CRay in, CRay *out, int *n_points, TVector3 *points);
         double getD() { return _d; }
         TH2F* GetHIn() const {return hin;};
         TH2F* GetHOut() const {return hout;};
         int GetExitHits() {return (int)hfate->GetBinContent(5);};
         int GetEnteranceHits() {return (int)hfate->GetBinContent(6);};
         void GetVFate(int *out);
-        int GetMAXODB() const {return VODNIK_MAX_ODB;};
+        int GetMAXODB() const {return MAX_REFLECTIONS;};
         void Draw(int color = 1, int width = 1);
         void DrawSkel(int color = 1, int width = 1);
 private:
   Fate fate;
         double _d; // parameters
         double n1, n2, n3; // refractive index: n1 above entry surface, n2 inside, n3 after exit
         double _r;
         double absorption;
 class Plate
+{
 public:
   Plate(DetectorParameters& parameters);
+  ~Plate() {
-  ~Plate() { //delete []sides; // the same, needs solution
+    for (int jk=0; jk<6; jk++) delete sides[jk]; // the same, needs solution
   };
   void draw(int color, int width);
   void drawSkel(int color, int width);
-  int propagateRay(CRay, CRay*, int*, TVector3*);
+  Fate propagateRay(CRay, CRay*, int*, TVector3*);
 private:
         TVector3 plate_edge[8];
         CSurface *sides[6];
 };
         double _plateWidth;
         int _plateOn;
         TH2F *histoPlate;
+        double offsetY;
+        double offsetZ;
 };
 //=================================================================================

Subversion Repositories f9daq

(root)/lightguide/trunk/include/guide.h – Rev 25 → 54