In order to use the new TPC dEdx information within the common pid classes the new...

ESD to STEERBase, where it should have gone in the first place. In addition a new virtual function in AliVTrack was introduced.
Jens Wiechula

diff --git a/STEER/CMakelibESD.pkg b/STEER/CMakelibESD.pkg
index 311922391191974362f3e0be13430b9586087632..e5454fd890c272e87813267477827ce29f1ce2aa 100644 (file)
--- a/STEER/CMakelibESD.pkg
+++ b/STEER/CMakelibESD.pkg
@@ -66,7 +66,6 @@ set ( SRCS
     ESD/AliTriggerClass.cxx 
     ESD/AliTriggerConfiguration.cxx 
     ESD/AliExpression.cxx
     ESD/AliTriggerClass.cxx 
     ESD/AliTriggerConfiguration.cxx 
     ESD/AliExpression.cxx

-    ESD/AliTPCdEdxInfo.cxx 

     )
 
 string( REPLACE ".cxx" ".h" HDRS "${SRCS}")
     )
 
 string( REPLACE ".cxx" ".h" HDRS "${SRCS}")

diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg
index a2347023be02cce6a2a6730dcc7fecef0e22f391..e9450ba8c496988713a8d80d8c89cdc946b95338 100644 (file)
--- a/STEER/CMakelibSTEERBase.pkg
+++ b/STEER/CMakelibSTEERBase.pkg
@@ -75,7 +75,8 @@ set ( SRCS
     STEERBase/AliMathBase.cxx 
     STEERBase/TTreeStream.cxx 
     STEERBase/AliVMFT.cxx
     STEERBase/AliMathBase.cxx 
     STEERBase/TTreeStream.cxx 
     STEERBase/AliVMFT.cxx

-    )
+    STEERBase/AliTPCdEdxInfo.cxx
+  )

 
 string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")
 
 
 string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")
 

diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h
index 373d2d4c0788de0731b8955eed0d82dcf4e8f829..6ca7d3280aec8bdb542606dbc27c5fc6195f052e 100644 (file)
--- a/STEER/ESDLinkDef.h
+++ b/STEER/ESDLinkDef.h
@@ -109,7 +109,6 @@
 #pragma link C++ class AliTriggerConfiguration+;
 #pragma link C++ class AliExpression+;
 #pragma link C++ class AliVariableExpression+;
 #pragma link C++ class AliTriggerConfiguration+;
 #pragma link C++ class AliExpression+;
 #pragma link C++ class AliVariableExpression+;

-#pragma link C++ class AliTPCdEdxInfo+;

 
 #pragma link C++ function AliESDUtils::GetCorrV0(const AliESDEvent*,Float_t &);
 #pragma link C++ function AliESDUtils::GetCorrSPD2(Float_t,Float_t);
 
 #pragma link C++ function AliESDUtils::GetCorrV0(const AliESDEvent*,Float_t &);
 #pragma link C++ function AliESDUtils::GetCorrSPD2(Float_t,Float_t);

diff --git a/STEER/ESD/AliTPCdEdxInfo.cxx b/STEER/STEERBase/AliTPCdEdxInfo.cxx
similarity index 100%
rename from STEER/ESD/AliTPCdEdxInfo.cxx
rename to STEER/STEERBase/AliTPCdEdxInfo.cxx

diff --git a/STEER/ESD/AliTPCdEdxInfo.h b/STEER/STEERBase/AliTPCdEdxInfo.h
similarity index 100%
rename from STEER/ESD/AliTPCdEdxInfo.h
rename to STEER/STEERBase/AliTPCdEdxInfo.h

diff --git a/STEER/STEERBase/AliVTrack.h b/STEER/STEERBase/AliVTrack.h
index 85a31d8a38869b9ac0c17a6c7c06e5391818f8d4..2f41666bf037196727097d951e44e37b42caa44b 100644 (file)
--- a/STEER/STEERBase/AliVTrack.h
+++ b/STEER/STEERBase/AliVTrack.h
@@ -15,7 +15,8 @@
 \r
 class AliVVertex;\r
 class AliExternalTrackParam;\r
 \r
 class AliVVertex;\r
 class AliExternalTrackParam;\r

-\r
+class AliTPCdEdxInfo;\r
+ \r

 class AliVTrack: public AliVParticle {\r
 \r
 public:\r
 class AliVTrack: public AliVParticle {\r
 \r
 public:\r


@@ -52,6 +53,7 @@ public:
   virtual Int_t    GetID() const = 0;\r
   virtual UChar_t  GetITSClusterMap() const = 0;\r
   virtual Float_t  GetTPCClusterInfo(Int_t /*nNeighbours*/, Int_t /*type*/, Int_t /*row0*/=0, Int_t /*row1*/=159) const {return 0.;}\r
   virtual Int_t    GetID() const = 0;\r
   virtual UChar_t  GetITSClusterMap() const = 0;\r
   virtual Float_t  GetTPCClusterInfo(Int_t /*nNeighbours*/, Int_t /*type*/, Int_t /*row0*/=0, Int_t /*row1*/=159) const {return 0.;}\r

+  virtual AliTPCdEdxInfo * GetTPCdEdxInfo() {return 0x0;}\r

   virtual UShort_t GetTPCNcls() const { return 0;}\r
   virtual UShort_t GetTPCNclsF() const { return 0;}\r
   virtual Double_t GetTRDslice(Int_t /*plane*/, Int_t /*slice*/) const { return -1.; }\r
   virtual UShort_t GetTPCNcls() const { return 0;}\r
   virtual UShort_t GetTPCNclsF() const { return 0;}\r
   virtual Double_t GetTRDslice(Int_t /*plane*/, Int_t /*slice*/) const { return -1.; }\r

diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h
index 250d171be7be65157af05711632709e728022f2e..2a7cc7d6eecd35aab40e719e166961f608208b8e 100644 (file)
--- a/STEER/STEERBaseLinkDef.h
+++ b/STEER/STEERBaseLinkDef.h
@@ -91,6 +91,7 @@
 #pragma link C++ class AliPIDResponse+;
 #pragma link C++ class AliITSPIDResponse+;
 #pragma link C++ class AliTPCPIDResponse+;
 #pragma link C++ class AliPIDResponse+;
 #pragma link C++ class AliITSPIDResponse+;
 #pragma link C++ class AliTPCPIDResponse+;

+#pragma link C++ class AliTPCdEdxInfo+;

 #pragma link C++ class AliTOFPIDResponse+;
 #pragma link C++ class AliTRDPIDResponse+;
 #pragma link C++ class AliEMCALPIDResponse+;
 #pragma link C++ class AliTOFPIDResponse+;
 #pragma link C++ class AliTRDPIDResponse+;
 #pragma link C++ class AliEMCALPIDResponse+;