Critical bug fix in the ITS hit generation

- Fixing incorrect calculation of the chip ID and incorrect assignment
  of the detector ID to the hit in its/Detector.cxx
- Implement exception thrown by chip in case of the assignment of a hit
  to a chip with a different chip ID
- Create subdirectory test for test task and its for ITS-related test
- Implement ITS hit test suite

Author: mfasDa

CMakeLists.txt

@@ -217,6 +217,7 @@ add_subdirectory (field)
 add_subdirectory (devices)
 add_subdirectory (macro)
 add_subdirectory (o2cdb)
+add_subdirectory (test)
 
 
 Option(BUILD_DOXYGEN "Build Doxygen" OFF)

its/Chip.cxx

@@ -3,14 +3,16 @@
 //  ALICEO2
 //
 //  Created by Markus Fasel on 23.07.15.
-//  Adapted from AliITSUChip by Massimo Masers
+//  Adapted from AliITSUChip by Massimo Masera
 //
 
 #include <TMath.h>
 
-#include "Chip.h"
-#include "Point.h"
-#include "UpgradeGeometryTGeo.h"
+#include "FairLogger.h"
+
+#include "its/Chip.h"
+#include "its/Point.h"
+#include "its/UpgradeGeometryTGeo.h"
 
 ClassImp(AliceO2::ITS::Chip)
 
@@ -73,6 +75,9 @@ Chip::~Chip(){
 }
 
 void Chip::InsertPoint(Point *p){
+  if (p->GetDetectorID() != fChipIndex) {
+    throw IndexException(fChipIndex, p->GetDetectorID());
+  }
   fPoints.AddLast(p);
 }
 
@@ -99,8 +104,10 @@ Bool_t Chip::LineSegmentLocal(Int_t hitindex, Double_t &xstart, Double_t &xpoint
   Double_t  posglob[3] = { tmp->GetX(), tmp->GetY(), tmp->GetZ()},
   posglobStart[3] = {tmp->GetStartX(), tmp->GetStartY(), tmp->GetStartZ()},
   posloc[3], poslocStart[3];
+  memset(posloc, 0, sizeof(Double_t)*3);
+  memset(poslocStart, 0, sizeof(Double_t)*3);
 
-  // convert to global position
+  // convert to local position
   fGeometry->globalToLocal(fChipIndex, posglob, posloc);
   fGeometry->globalToLocal(fChipIndex, posglobStart, poslocStart);
 
@@ -109,8 +116,8 @@ Bool_t Chip::LineSegmentLocal(Int_t hitindex, Double_t &xstart, Double_t &xpoint
   ystart = poslocStart[1];
   zstart = poslocStart[2];
   xpoint = posloc[0] - poslocStart[0];
-  ypoint = posloc[0] - poslocStart[0];
-  zpoint = posloc[0] - poslocStart[0];
+  ypoint = posloc[1] - poslocStart[1];
+  zpoint = posloc[2] - poslocStart[2];
 
   timestart = tmp->GetStartTime();
   eloss = tmp->GetEnergyLoss();

its/Chip.h

@@ -9,6 +9,9 @@
 #ifndef ALICEO2_ITS_CHIP_
 #define ALICEO2_ITS_CHIP_
 
+#include <exception>
+#include <sstream>
+
 #include <TObjArray.h>
 #include "TObject.h"
 
@@ -26,6 +29,51 @@ namespace AliceO2 {
     /// chip identified by the chip index.
     class Chip : public TObject {
     public:
+      
+      /// @class IndexException
+      /// @brief Handling discrepancies between Chip index stored in the hit
+      /// and Chip index stored in the chip
+      class IndexException : public std::exception{
+      public:
+        
+        /// Default constructor
+        /// Initializes indices with -1. Not to be used when throwing the
+        /// exception. Use other constructor instead
+        IndexException(): fDetIdChip(-1), fDetIdHit(-1){}
+        
+        /// Constructor
+        /// Initializing indices from chip and from hit
+        /// @param indexChip Chip index stored in chip itself
+        /// @param indexHit Chip index stored in the hit
+        IndexException(ULong_t indexChip, ULong_t indexHit) :
+        fDetIdChip(indexChip), fDetIdHit(indexHit)
+        {}
+        
+        /// Destructor
+        virtual ~IndexException() throw () {}
+        
+        /// Build error message
+        /// The error message contains the indices stored in the chip and in the hit
+        /// @return Error message connected to this exception
+        const char *what() const throw() {
+          std::stringstream message;
+          message << "Chip ID " << fDetIdHit << " from hit different compared to this ID " << fDetIdChip;
+          return message.str().c_str();
+        }
+        
+        /// Get the chip index stored in the chip
+        /// @return Chip index stored in the chip
+        ULong_t     GetChipIndexChip() const { return fDetIdChip; }
+          
+        /// Fet the chip index stored in the hit
+        /// @return Chip index stored in the hit
+        ULong_t     GetChipIndexHit() const { return fDetIdHit; }
+        
+      private:
+        ULong_t           fDetIdChip;               ///< Index of the chip stored in the chip
+        ULong_t           fDetIdHit;                ///< Index of the chip stored in the hit
+      };
+      
       /// Default constructor
       Chip();
 
@@ -71,7 +119,7 @@ namespace AliceO2 {
 
       /// Empties the point container
       /// @param option unused
-      void Clear(Option_t *opt = "");
+      virtual void Clear(Option_t *opt = "");
 
       /// Change the chip index
       /// @param index New chip index

its/Detector.cxx

@@ -415,7 +415,6 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   Int_t copy = vol->getCopyNo();
   Int_t id = vol->getMCid();
   Int_t lay = 0;
-  Int_t cpn0, cpn1, mod;
 
   // FIXME: Determine the layer number. Is this information available directly from the FairVolume?
   while ((lay < mNumberLayers) && id != mLayerID[lay]) {
@@ -428,12 +427,13 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   // } // if Outer ITS mother Volume
 
   // Retrieve the indices with the volume path
-  copy = 1;
-  gMC->CurrentVolOffID(1, cpn1);
-  gMC->CurrentVolOffID(2, cpn0);
-
-  mod = mGeometryTGeo->getChipIndex(lay, cpn0, cpn1);
-
+  int stave(0), halfstave(0), chipinmodule(0), module;
+  gMC->CurrentVolOffID(1, chipinmodule);
+  gMC->CurrentVolOffID(2, module);
+  gMC->CurrentVolOffID(3, halfstave);
+  gMC->CurrentVolOffID(4, stave);
+  int chipindex = mGeometryTGeo->getChipIndex(lay, stave, halfstave, module, chipinmodule);
+  
   // Record information on the points
   mEnergyLoss = gMC->Edep();
   mTime = gMC->TrackTime();
@@ -463,7 +463,7 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   }
 
   // Create Point on every step of the active volume
-  addHit(mTrackNumberID, mVolumeID,
+  addHit(mTrackNumberID, chipindex, //mVolumeID,
          TVector3(mEntrancePosition.X(), mEntrancePosition.Y(), mEntrancePosition.Z()),
          TVector3(mPosition.X(), mPosition.Y(), mPosition.Z()),
          TVector3(mMomentum.Px(), mMomentum.Py(), mMomentum.Pz()), mEntranceTime, mTime, mLength,

test/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(its)

test/its/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(INCLUDE_DIRECTORIES
+${CMAKE_SOURCE_DIR}
+${CMAKE_SOURCE_DIR}/its
+${CMAKE_SOURCE_DIR}/header
+${CMAKE_SOURCE_DIR}/test/its
+${BASE_INCLUDE_DIRECTORIES}
+${Boost_INCLUDE_DIRS}
+${FAIRROOT_INCLUDE_DIR}
+${AlFa_DIR}/include
+${ROOT_INCLUDE_DIR}
+)
+
+include_directories( ${INCLUDE_DIRECTORIES})
+
+set(LINK_DIRECTORIES
+${ROOT_LIBRARY_DIR}
+${FAIRROOT_LIBRARY_DIR}
+)
+
+link_directories( ${LINK_DIRECTORIES})
+
+set(SRCS
+HitAnalysis.cxx
+)
+
+Set(LINKDEF testitsLinkDef.h)
+Set(LIBRARY_NAME testits)
+Set(DEPENDENCIES
+    AliceO2Base its
+)
+
+GENERATE_LIBRARY()
+