AliceO2-256: Fix dependency

mfasDa · ktf · commit ab5cf8a41939 · 2017-04-04T22:15:36.000+02:00
- Add Matrix depencency for FairMCPoint
- Reduce datatypes to primitive data types as arguments
  as indicated in the discussion of the PR
diff --git a/Detectors/EMCAL/base/include/EMCALBase/Point.h b/Detectors/EMCAL/base/include/EMCALBase/Point.h
@@ -30,7 +30,7 @@ namespace AliceO2 {
       /// \param tof Time of the hit
       /// \param length Length of the segment
       /// \param EventId Event ID
-      Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, TVector3 pos, TVector3 mom,
+      Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, Double_t *pos, Double_t *mom,
             Double_t tof, Double_t eLoss, UInt_t EventId=0);
       
       /// \brief Check whether the points are from the same parent and in the same detector volume
diff --git a/Detectors/EMCAL/base/src/Point.cxx b/Detectors/EMCAL/base/src/Point.cxx
@@ -9,7 +9,7 @@ Point::Point():
 {
 }
 
-Point::Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, TVector3 pos, TVector3 mom,
+Point::Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, Double_t *pos, Double_t *mom,
              Double_t tof, Double_t eLoss, UInt_t EventId):
   FairMCPoint(trackID, detID, pos, mom, tof, 0., eLoss, EventId),
   mShunt(shunt),
diff --git a/Detectors/EMCAL/simulation/include/EMCALSimulation/Detector.h b/Detectors/EMCAL/simulation/include/EMCALSimulation/Detector.h
@@ -20,22 +20,22 @@ namespace AliceO2 {
       
       virtual ~Detector();
       
-      virtual void   Initialize();
+      virtual void   Initialize() final;
       
-      virtual Bool_t ProcessHits( FairVolume* v=0);
+      virtual Bool_t ProcessHits( FairVolume* v=0) final;
       
       Point *AddHit(Int_t shunt, Int_t trackID, Int_t parentID, Int_t primary, Double_t initialEnergy,
-                    Int_t detID, TVector3 pos, TVector3 mom, Double_t time, Double_t length);
+                    Int_t detID, Double_t *pos, Double_t *mom, Double_t time, Double_t length);
       
       virtual void   Register();
       
-      virtual TClonesArray* GetCollection(Int_t iColl) const ;
+      virtual TClonesArray* GetCollection(Int_t iColl) const final;
       
-      virtual void   Reset();
+      virtual void   Reset() final;
       
     protected:
       
-      virtual void CreateMaterials();
+      virtual void CreateMaterials() final;
       
     private:
     
diff --git a/Detectors/EMCAL/simulation/src/Detector.cxx b/Detectors/EMCAL/simulation/src/Detector.cxx
@@ -35,7 +35,7 @@ Bool_t Detector::ProcessHits( FairVolume* v) {
 }
 
 Point *Detector::AddHit(Int_t shunt, Int_t trackID, Int_t parentID, Int_t primary, Double_t initialEnergy,
-              Int_t detID, TVector3 pos, TVector3 mom, Double_t time, Double_t eLoss){
+              Int_t detID, Double_t *pos, Double_t *mom, Double_t time, Double_t eLoss){
   
   TClonesArray& refCollection = *mPointCollection;
   Int_t size = refCollection.GetEntriesFast();
diff --git a/cmake/O2Dependencies.cmake b/cmake/O2Dependencies.cmake
@@ -674,8 +674,10 @@ o2_define_bucket(
     DEPENDENCIES
     root_base_bucket
     fairroot_base_bucket
+    MathCore
+    Matrix
     ParBase
-    
+
     INCLUDE_DIRECTORIES
     ${FAIRROOT_INCLUDE_DIR}
 )
@@ -691,6 +693,7 @@ o2_define_bucket(
     RIO
     Graf
     Gpad
+    Matrix
     EMCALBase
     DetectorsBase
     SimulationDataFormat
@@ -700,4 +703,3 @@ o2_define_bucket(
     ${CMAKE_SOURCE_DIR}/Detectors/Base/include
     ${CMAKE_SOURCE_DIR}/Detectors/EMCAL/base/include
 )
-

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Point::Point():`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`		`-Point::Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, TVector3 pos, TVector3 mom,`
	`12`	`+Point::Point(Int_t shunt, Int_t primary, Int_t trackID, Int_t parentID, Int_t detID, Int_t initialEnergy, Double_t pos, Double_t mom,`
`13`	`13`	`Double_t tof, Double_t eLoss, UInt_t EventId):`
`14`	`14`	`FairMCPoint(trackID, detID, pos, mom, tof, 0., eLoss, EventId),`
`15`	`15`	`mShunt(shunt),`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ Bool_t Detector::ProcessHits( FairVolume* v) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`Point *Detector::AddHit(Int_t shunt, Int_t trackID, Int_t parentID, Int_t primary, Double_t initialEnergy,`
`38`		`- Int_t detID, TVector3 pos, TVector3 mom, Double_t time, Double_t eLoss){`
	`38`	`+ Int_t detID, Double_t pos, Double_t mom, Double_t time, Double_t eLoss){`
`39`	`39`
`40`	`40`	`TClonesArray& refCollection = *mPointCollection;`
`41`	`41`	`Int_t size = refCollection.GetEntriesFast();`