Revert "merge TRestHits update"

This reverts commit edb4033, reversing
changes made to 8f7f6c5.

Author: jgalan

source/events/addons/src/TRestMesh.cxx

@@ -128,11 +128,8 @@ Int_t TRestMesh::GetNodeZ(Double_t z) {
 }
 
 void TRestMesh::SetNodesFromHits(TRestHits* hits) {
-    double nan = numeric_limits<double>::quiet_NaN();
     for (int hit = 0; hit < hits->GetNumberOfHits(); hit++) {
-        REST_HitType type = hits->GetType(hit);
-        this->AddNode(type == YZ ? nan : hits->GetX(hit), type == XZ ? nan : hits->GetY(hit),
-                      hits->GetZ(hit));
+        this->AddNode(hits->GetX(hit), hits->GetY(hit), hits->GetZ(hit));
     }
 
     Regrouping();

source/events/general/inc/TRestHits.h

@@ -30,12 +30,12 @@
 #include "TMatrixD.h"
 #include "TObject.h"
 
-
-    enum REST_HitType { unknown = -1, X = 2, Y = 3, Z = 5, XY = 6, XZ = 10, YZ = 15, XYZ = 30 };
 //! It let save an event as a set of punctual deposition.
 //! It saves a 3-coordinate position and an energy for each punctual deposition.
 class TRestHits : public TObject {
    private:
+    enum REST_HitType { unknown = -1, XZ = 1, YZ = 2, XY = 3, XYZ = 0 };
+
    public:
     Int_t fNHits;         ///< Number of punctual energy depositions, it is the lenght
                           ///< for all the array
@@ -51,7 +51,7 @@ class TRestHits : public TObject {
                                    // (units us, 0 is time of decay)
     std::vector<Float_t> fEnergy;  // [fNHits] Energy deposited at each
                                    // 3-coordinate position (units keV)
-    std::vector <REST_HitType> fType;  //
+    REST_HitType fType;            //!
     //! Changes the origin of the Cartesian coordinate system
     void Translate(Int_t n, Double_t x, Double_t y, Double_t z);
     /// Event is rotated in XYZ.
@@ -63,8 +63,8 @@ class TRestHits : public TObject {
                 TVector3 vMean);  // vMean is the mean position of the event from
                                   // GetMeanPosition()
 
-    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t t = 0, REST_HitType type = XYZ);
-    void AddHit(TVector3 pos, Double_t en, Double_t t = 0, REST_HitType type = XYZ);
+    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t t = 0);
+    void AddHit(TVector3 pos, Double_t en, Double_t t = 0);
     void AddHit(TRestHits& hits, Int_t n);
 
     void RemoveHits();
@@ -78,10 +78,10 @@ class TRestHits : public TObject {
     virtual void SwapHits(Int_t i, Int_t j);
     virtual void RemoveHit(int n);
 
-    virtual Bool_t areXY();
-    virtual Bool_t areXZ();
-    virtual Bool_t areYZ();
-    virtual Bool_t areXYZ();
+    Bool_t areXY();
+    Bool_t areXZ();
+    Bool_t areYZ();
+    Bool_t areXYZ();
 
     Bool_t isNaN(Int_t n);
 
@@ -103,7 +103,6 @@ class TRestHits : public TObject {
     Double_t GetY(int n) { return ((Double_t)fY[n]); }     // return value in mm
     Double_t GetZ(int n) { return ((Double_t)fZ[n]); }     // return value in mm
     Double_t GetTime(int n) { return ((Double_t)fT[n]); }  // return value in us
-    REST_HitType GetType(int n) { return fType[n]; }
 
     TVector3 GetPosition(int n);
     TVector3 GetVector(int i, int j);
@@ -184,11 +183,11 @@ class TRestHits : public TObject {
 
     virtual void PrintHits(Int_t nHits = -1);
 
-    // Construtor
+    // Constructor
     TRestHits();
     // Destructor
     ~TRestHits();
 
-    ClassDef(TRestHits, 5);
+    ClassDef(TRestHits, 4);
 };
 #endif

source/events/general/inc/TRestHitsEvent.h

@@ -73,8 +73,8 @@ class TRestHitsEvent : public TRestEvent {
     TRestHits* fHits;  //->
 
    public:
-    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t t = 0, REST_HitType type = XYZ);
-    void AddHit(TVector3 pos, Double_t en, Double_t t = 0, REST_HitType type = XYZ);
+    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t t = 0);
+    void AddHit(TVector3 pos, Double_t en, Double_t t = 0);
 
     void RemoveHits();
 
@@ -96,8 +96,6 @@ class TRestHitsEvent : public TRestEvent {
     /// Returns the Z-coordinate of hit entry `n` in mm.
     Double_t GetZ(int n) { return fHits->GetZ(n); }
 
-    REST_HitType GetType(int n) { return fHits->GetType(n); }
-
     /// Returns the squared distance between hits `n` and `m`.
     Double_t GetDistance2(int n, int m) { return fHits->GetDistance2(n, m); }
 

source/events/general/inc/TRestVolumeHits.h

@@ -8,8 +8,7 @@
 ///             TRestVolumeHits.h
 ///
 ///             Event class to store signals form simulation and acquisition
-///             events. We should make sure that all the hit points in it is 
-///             with same type. e.g. all XZ hits
+///             events
 ///
 ///             oct 2015:   First concept
 ///                 Created as part of the conceptualization of existing REST
@@ -33,24 +32,27 @@ class TRestVolumeHits : public TRestHits {
     std::vector<Float_t> fSigmaZ;  // [fNHits] Sigma on Z axis for each volume hit (units microms)
 
    public:
-    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t time, REST_HitType type, Double_t sigmax, Double_t sigmay,
+    void AddHit(Double_t x, Double_t y, Double_t z, Double_t en, Double_t sigmax, Double_t sigmay,
                 Double_t sigmaz);
-    void AddHit(TVector3 pos, Double_t en, Double_t time, REST_HitType type, TVector3 sigma);
-    void AddHit(TRestVolumeHits& hits, Int_t n);
+    void AddHit(TVector3 pos, Double_t en, TVector3 sigma);
+    void AddHit(TRestVolumeHits& hits, Int_t n) {
+        Double_t x = hits.GetX(n);
+        Double_t y = hits.GetY(n);
+        Double_t z = hits.GetZ(n);
+        Double_t en = hits.GetEnergy(n);
+        Double_t sx = hits.GetSigmaX(n);
+        Double_t sy = hits.GetSigmaY(n);
+        Double_t sz = hits.GetSigmaZ(n);
+
+        AddHit(x, y, z, en, sx, sy, sz);
+    }
 
     void RemoveHits();
     void MergeHits(Int_t n, Int_t m);
 
     void RemoveHit(int n);
     void SortByEnergy();
     void SwapHits(Int_t i, Int_t j);
-
-
-    Bool_t areXY();
-    Bool_t areXZ();
-    Bool_t areYZ();
-    Bool_t areXYZ();
-
     // Setters
 
     // Getters
@@ -72,6 +74,6 @@ class TRestVolumeHits : public TRestHits {
     // Destructor
     ~TRestVolumeHits();
 
-    ClassDef(TRestVolumeHits, 2);
+    ClassDef(TRestVolumeHits, 1);
 };
 #endif