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

 #include "TROOT.h"
 #include "TVector3.h"
 #include "TMath.h"
 #include "TPolyLine3D.h"
-#include "TRandom.h"
+#include "TRandom2.h"
 #include "TDatime.h"
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TColor.h"
+{
 public:
   CRay() :
     r(TVector3(0,0,0)),
     k(TVector3(1,0,0)),
-    //p(TVector3(0,1,0)),
+    p(TVector3(0,1,0)),
-    p(TVector3(0,0,1)),
     color(kBlack)
   {};
   CRay(TVector3 r0, TVector3 k0) :
     r(r0),
     k(k0.Unit()),
-    //p(TVector3(0,1,0)),
+    p(TVector3(0,1,0)),
-    p(TVector3(0,0,1)),
+    //p(TVector3(0,0,1)),
     color(kBlack)
   {};
   CRay(double x0, double y0, double z0, double l0, double m0, double n0) :
     r(TVector3(x0,y0,z0)),
     k(TVector3(l0,m0,n0).Unit()),
-    //p(TVector3(0,1,0)),
+    p(TVector3(0,1,0)),
-    p(TVector3(0,0,1)),
+    //p(TVector3(0,0,1)),
     color(kBlack)
   {};
   void Set(TVector3 r0, TVector3 k0);
   //void Set(double x0, double y0, double z0, double l0, double m0, double n0);
   void setPolarization(TVector3 p0) {
     p = p0.Unit();
     if (p.Dot(k)>1e-3) printf("*** ERROR in CRay: E has component || with k\n");
   };
-  //inline CRay & operator = (const CRay &);
+  inline CRay & operator = (const CRay &);
   TVector3 GetR() const {return r;};
   TVector3 GetK() const {return k;};
   TVector3 GetP() const {return p;};
 public:
   CPlane4();
   CPlane4(TVector3 r1, TVector3 r2, TVector3 r3, TVector3 r4);
   CPlane4(TVector3 *vr);
+  ~CPlane4() { };
   void Set(TVector3 r1, TVector3 r2, TVector3 r3, TVector3 r4);
   void Set(TVector3 *vr) {Set(vr[0], vr[1], vr[2], vr[3]);};
   void FlipN(){n = -n;};
   int GetIntersection(TVector3 *vec, CRay ray);
   void Print();
   void Draw(int color = 1, int width = 1);
 private:
-  TVector3 r[4], n;
+  TVector3 r[4];
+  TVector3 n;
   double A, B, C, D;
   TVector3 edge[4]; // vektorji stranic
   double angle_r[4]; // koti ob posameznem vogalu
 };
 //=================================================================================
+{
 public:
   CPlaneR(TVector3 c, TVector3 n0, double R0)
   {center = c; n = n0; _r = R0;};
+  CPlaneR(){ n=TVector3(0,0,0); center=TVector3(0,0,0); _r=0; };
+  ~CPlaneR() {};
   void Set(TVector3 c, TVector3 n0, double R0)
   {center = c; n = n0; _r = R0;};
   int TestIntersection(TVector3 *vec, CRay in);
 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);
+  ~CSurface() {};
+  CSurface& operator=(const CSurface& rhs) {
+    type=rhs.type;
+    n1=rhs.n1;
+    n2=rhs.n2;
+    n1_n2=rhs.n1_n2;
+    reflection=rhs.reflection;
+    cosTtotal=rhs.cosTtotal;
+    fresnel=rhs.fresnel;
+    return *this;
+  }
   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 Set(int type0, TVector3 *vr, double n10, double n20, double reflectivity)
   {type = type0; CPlane4::Set(vr); SetIndex(n10, n20); reflection = reflectivity;};
   void Set(int type0, TVector3 r1, TVector3 r2, TVector3 r3, TVector3 r4, double n10, double n20, double reflectivity)
   {type = type0; CPlane4::Set(r1, r2, r3, r4); SetIndex(n10, n20); reflection = reflectivity;};
-  int PropagateRay(CRay in, CRay *out, TVector3 *intersection);
+  int PropagateRay(CRay in, CRay& out, TVector3 *intersection);
   double N1_N2(int sign) { return ((sign > 0) ? n1/n2 : n2/n1);};
   void Print(){printf("Type = %d\n", type); CPlane4::Print();};
 private:
   int type; //0 = dummy; 1 = refractor; 2 = reflector; 3 = total reflection
   double n1, n2, n1_n2; //index of refraction, n1 @ +normal, n2 @ -normal
   double reflection; // odbojnost stranic
-  TRandom rand; // za racunanje verjetnosti odboja od zrcala
+  TRandom2 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
 };
   TVector3 _gap;
   int _fresnel;
   int _guideOn;
   double offsetY;
   double offsetZ;
   int _plateOn;
   double _plateWidth;
   int _glassOn;
   double _glassD;
   bool _coupling;
 };
 class Guide
+{
 public:
   Guide(TVector3 center0, DetectorParameters& parameters);
   ~Guide() {
-    for (int jk=0; jk<6; jk++) delete s_side[jk];
+    //for (int jk=0; jk<6; jk++) delete s_side[jk];
-    delete grease;
+    //delete [] s_side;
-    delete noCoupling;
-    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);
+  Fate PropagateRay(CRay in, CRay& out, int *n_points, TVector3 *points);
   double getD() { return _d; }
   double getN1() { return _n1; };
   double getN2() { return _n2; };
   double getN3() { return _n3; };
-  TH1F* GetHFate() const {return hfate;};
+  TH1F* GetHFate() {return &hfate;};
-  TH1F* GetHNOdb_all() const {return hnodb_all;};
+  TH1F* GetHNOdb_all() {return &hnodb_all;};
-  TH1F* GetHNOdb_exit() const {return hnodb_exit;};
+  TH1F* GetHNOdb_exit() {return &hnodb_exit;};
-  TH2F* GetHIn() const {return hin;};
+  TH2F* GetHIn() {return &hin;};
-  TH2F* GetHOut() const {return hout;};
+  TH2F* GetHOut() {return &hout;};
-  int GetExitHits() {return (int)hfate->GetBinContent(5);};
+  int GetExitHits() {return (int)hfate.GetBinContent(5);};
-  int GetEnteranceHits() {return (int)hfate->GetBinContent(6);};
+  int GetEnteranceHits() {return (int)hfate.GetBinContent(6);};
   void GetVFate(int *out);
   int GetMAXODB() const {return MAX_REFLECTIONS;};
   void Draw(int color = 1, int width = 1);
   void DrawSkel(int color = 1, int width = 1);
   double _n1, _n2, _n3; // refractive index: n1 above entry surface, n2 inside, n3 after exit
   double _r;
   double _absorption;
   double _A;
   bool _badCoupling;
-  TRandom rand; // for material absorption
+  TRandom2 rand; // for material absorption
-  CSurface *s_side[6];
+  CSurface s_side[6];
-  CPlaneR* grease;
+  CPlaneR grease;
-  CSurface* noCoupling;
+  CSurface noCoupling;
+  TVector3 center;
-  TVector3 center, vodnik_edge[8];
+  TVector3 vodnik_edge[8];
+  TH1F hfate;
+  TH1F hnodb_all;
-  TH1F *hfate, *hnodb_all, *hnodb_exit;
+  TH1F hnodb_exit;
+  TH2F hin;
-  TH2F *hin, *hout;
+  TH2F hout;
 };
 class Plate
+{
 public:
   Plate(DetectorParameters& parameters);
-  ~Plate() {
+  ~Plate() { };
-    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);
-  Fate propagateRay(CRay, CRay*, int*, TVector3*);
+  Fate propagateRay(CRay, CRay&, int*, TVector3*);
 private:
   TVector3 plate_edge[8];
-  CSurface *sides[6];
+  CSurface sides[6];
 };
 class CDetector
+{
 public:
   CDetector(TVector3 center0, DetectorParameters& parameters);
   ~CDetector() {
-    delete glass;
+    //delete glass;
-    delete glass_circle;
+    //delete glass_circle;
-    delete hglass;
+    //delete hglass;
-    delete active;
+    //delete active;
-    delete hactive;
+    //delete hactive;
-    delete hlaser;
+    //delete hlaser;
-    delete detector;
+    //delete detector;
-    delete hdetector;
+    //delete hdetector;
-    delete guide;
+    //delete guide;
-    delete plate;
+    //delete plate;
-    delete histoPlate;
+    //delete histoPlate;
     //delete window;
     //delete window_circle;
     //delete hwindow;
+  }
   //void SetGuideOn(int b)
   //{guide_on = b;};
   //void Init();
-  int Propagate(CRay, CRay*, int);
+  int Propagate(CRay, CRay&, int);
-  Guide* GetLG() const {return guide;};
+  Guide* GetLG() {return &guide;};
   //TH2F* GetHWindow() const {return hwindow;};
-  TH2F* GetHGlass() const {return hglass;};
+  TH2F* GetHGlass() {return &hglass;};
-  TH2F* GetHActive() const {return hactive;};
+  TH2F* GetHActive() {return &hactive;};
-  TH2F* GetHLaser() const {return hlaser;};
+  TH2F* GetHLaser() {return &hlaser;};
-  TH2F* GetHDetector() const {return hdetector;};
+  TH2F* GetHDetector() {return &hdetector;};
-  TH2F* GetHPlate() const {return histoPlate;};
+  TH2F* GetHPlate() {return &histoPlate;};
+  TH2F* GetGenerated() {return &generated;};
   //double GetSiPM() const {return SiPM;};
   //double GetM() const {return M;};
   //double GetD() const {return d;};
   //double GetR() const {return R;};
   //double getGlassWidth() {return glass_d;};
   //double GetWindowR() {return window_R;};
   //double GetWindowD() {return window_d;};
   void Draw(int width = 2);
 private:
   Fate fate;
   TVector3 center;
   //int type_in, type_side, type_out;
   //double SiPM, M, d, n1, n2, n3, R;
   //double detectorActive;
   int glass_on;
   double glass_d;
-  CSurface *glass;
+  CSurface glass;
-  CPlaneR *glass_circle;
+  CPlaneR glass_circle;
-  TH2F *hglass;
+  TH2F hglass;
   //double x_gap, y_gap, z_gap;
-  CPlane4* active;
+  CPlane4 active;
-  CPlaneR* grease;
+  CPlaneR grease;
-  TH2F *hactive, *hlaser;
+  TH2F hactive;
+  TH2F hlaser;
-  CPlane4 *detector;
+  CPlane4 detector;
-  TH2F *hdetector;
+  TH2F hdetector;
   int col_in, col_lg, col_out, col_rgla;
   int col_LG, col_glass, col_active;
   //int fresnel, absorption;
   //double A;
   int guide_on;
   //double window_R, window_d;
   //CSurface *window;
   //CPlaneR *window_circle;
   //TH2F *hwindow;
-  Guide *guide;
+  Guide guide;
-  Plate *plate;
+  Plate plate;
   double _plateWidth;
   int _plateOn;
-  TH2F *histoPlate;
+  TH2F histoPlate;
   double offsetY;
   double offsetZ;
+  TH2F generated;
 };
 #endif

Subversion Repositories f9daq

(root)//lightguide/trunk/include/guide.h – Rev 73 → 84