Modifications needed for the compilation of the femtoscopy code (Adam-Mike)

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoCoulomb.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoCoulomb.cxx
index 9978c3e913b18d3c172f94560e3664d1d22a60b8..7ec3e9340c57a67f7b78f2e7a64d99af22b18272 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoCoulomb.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoCoulomb.cxx
@@ -14,6 +14,9 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
  * First version on CVS
  *
@@ -47,7 +50,7 @@
 //#include "Stiostream.h"
 #include <stdio.h>
 #include <cassert>
-#include "PhysicalConstants.h"
+#include "Base/PhysicalConstants.h"
 
 #ifdef __ROOT__
 ClassImp(AliFemtoCoulomb)

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoEvent.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoEvent.cxx
index e5a3461f0d61ce8e1bb6e0c80c5b248e91cce172..5471c731600c2be03d6d63e418b190ae6623c30f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoEvent.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoEvent.cxx
@@ -13,6 +13,9 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.2  2007-04-03 16:00:08  mchojnacki
  * Changes to iprove memory managing
  *
@@ -127,8 +130,8 @@
 #include "Base/AliFemtoV0Cut.h"
 #include "Base/AliFemtoXiCut.h"
 #include "Base/AliFemtoKinkCut.h"
-#include "PhysicalConstants.h"
-#include "SystemOfUnits.h"
+#include "Base/PhysicalConstants.h"
+#include "Base/SystemOfUnits.h"
 
 // Mike removed all of the AliFemtoTTree stuff here 21apr2006 - it was not used for a long time.
 

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoKink.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoKink.cxx
index 9d50d367b4092054b884d42de3733190f824b980..02290b77e74bf67d640248df56e9945a1bd8da06 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoKink.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoKink.cxx
@@ -12,6 +12,9 @@
  ***********************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
  * First version on CVS
  *
@@ -43,7 +46,7 @@
  ***********************************************************************/
 
 #include "AliFemtoKink.h"
-#include "phys_constants.h"
+#include "Infrastructure/phys_constants.h"
 #include "Infrastructure/AliFemtoTrack.h"
 // -----------------------------------------------------------------------
 AliFemtoKink::AliFemtoKink(const AliFemtoKink& k){ // copy constructor

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoTrack.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoTrack.cxx
index 0070d7deceac0c6615fd8132e15e16463764dd35..08c42093a99e3414ff99346f58c7c0f438bd02f2 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoTrack.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFemtoTrack.cxx
@@ -10,6 +10,9 @@
  *
  ***************************************************************************
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.3  2007-04-03 16:00:09  mchojnacki
  * Changes to iprove memory managing
  *
@@ -83,7 +86,7 @@
 #endif
 #endif
 
-#include "SystemOfUnits.h"   // has "tesla" in it
+#include "Base/SystemOfUnits.h"   // has "tesla" in it
 //#include "AliFemtoParticleTypes.h"
 //#include "Infrastructure/AliFemtoTTreeEvent.h" 
 //#include "Infrastructure/AliFemtoTTreeTrack.h" 

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmHelix.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmHelix.cxx
index 6c4bba4a38a935669bc1228641c1b9ee59467c78..73bf1d2209f01c778507db908a04dd135a0b610b 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmHelix.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmHelix.cxx
@@ -10,6 +10,9 @@
 ***************************************************************************
 *
 * $Log$
+* Revision 1.1.1.1  2007/04/25 15:38:41  panos
+* Importing the HBT code dir
+*
 * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
 * First version on CVS
 *
@@ -110,8 +113,8 @@ using std::numeric_limits;
 #include <assert.h>
 
 #include "AliFmHelix.h"
-#include "PhysicalConstants.h" 
-#include "SystemOfUnits.h"
+#include "Base/PhysicalConstants.h" 
+#include "Base/SystemOfUnits.h"
 #ifdef __ROOT__
 ClassImpT(AliFmHelix,double);
 #endif

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmPhysicalHelix.cxx b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmPhysicalHelix.cxx
index e871acc82a5741cbee2698d77e621963024750c1..b05fd2ca29b2535fd71c8ad327dca41f52a0e693 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmPhysicalHelix.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/AliFmPhysicalHelix.cxx
@@ -11,6 +11,9 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
  * First version on CVS
  *
@@ -42,8 +45,8 @@
 #include <math.h>
 #include "AliFmHelix.h"
 #include "AliFmPhysicalHelix.h"
-#include "PhysicalConstants.h" 
-#include "SystemOfUnits.h"
+#include "Base/PhysicalConstants.h" 
+#include "Base/SystemOfUnits.h"
 #ifdef __ROOT__
 ClassImpT(AliFmPhysicalHelix,double);
 #endif

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/phys_constants.h b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/phys_constants.h
index adf5931593d770b10f05ad99d708d12d925b37f3..a8f2f7873ee7c860b9b62c98045cca7992452481 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/phys_constants.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/Infrastructure/phys_constants.h
@@ -5,7 +5,7 @@
 #ifndef _StHbt_phys_constants_h_
 #define _StHbt_phys_constants_h_
 
-#include "PhysicalConstants.h"  // from StarClassLibrary
+#include "Base/PhysicalConstants.h"  // from StarClassLibrary
 
 // the strangeness guys used a different naming system (of course)
 static const double M_LAMBDA        = lambda_mass_c2;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
index fdeea3d33c401a05d6216e8d237860df0aef5a7b..a6062ec71ace9503ba3fde0b32e09ad489552f73 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
@@ -1,6 +1,9 @@
 /*
  *$Id$
  *$Log$
+ *Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ *Importing the HBT code dir
+ *
  *Revision 1.5  2007-04-03 16:00:08  mchojnacki
  *Changes to iprove memory managing
  *
@@ -27,12 +30,12 @@
 
 //#include "TSystem.h"
 
-#include "AliFmPhysicalHelixD.h"
-#include "AliFmThreeVectorF.h"
+#include "Infrastructure/AliFmPhysicalHelixD.h"
+#include "Infrastructure/AliFmThreeVectorF.h"
 
-#include "SystemOfUnits.h"
+#include "Base/SystemOfUnits.h"
 
-#include "AliFemtoEvent.h"
+#include "Infrastructure/AliFemtoEvent.h"
 
 ClassImp(AliFemtoEventReaderESD)
 
@@ -196,7 +199,7 @@ AliFemtoEvent* AliFemtoEventReaderESD::ReturnHbtEvent()
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
-  hbtEvent->SetEventNumber(fEvent->GetEventNumber());
+  //hbtEvent->SetEventNumber(fEvent->GetEventNumber());
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.h b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.h
index 3f27d17bf264f35b7a2335532c2e59bd029a54ef..b5ee133e49cf14c1359e6c294e10dc4c3745c069 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.h
@@ -1,6 +1,9 @@
 /*
  *$Id$
  *$Log$
+ *Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ *Importing the HBT code dir
+ *
  *Revision 1.3  2007/03/13 15:30:03  mchojnacki
  *adding reader for simulated data
  *
@@ -19,8 +22,8 @@
 //made by Marek Chojnacki mchojnacki@knf.pw.edu.pl
 // Version 11 Added AliESDfriend reading
 // Adam Kisiel kisiel@mps.ohio-state.edu
-#include "AliFemtoEventReader.h"
-#include "AliFemtoEnumeration.h"
+#include "Base/AliFemtoEventReader.h"
+#include "Infrastructure/AliFemtoEnumeration.h"
 
 #include <string>
 #include <vector>

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
index 2ec84aa01678ca9d948e5f9bd5d1942a7faa455a..302d5d9478522b88b662e15cd9f7b4c98912eef4 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
@@ -5,12 +5,12 @@
 #include "AliESD.h"
 #include "AliESDtrack.h"
 
-#include "AliFmPhysicalHelixD.h"
-#include "AliFmThreeVectorF.h"
+#include "Infrastructure/AliFmPhysicalHelixD.h"
+#include "Infrastructure/AliFmThreeVectorF.h"
 
-#include "SystemOfUnits.h"
+#include "Base/SystemOfUnits.h"
 
-#include "AliFemtoEvent.h"
+#include "Infrastructure/AliFemtoEvent.h"
 
 ClassImp(AliFemtoEventReaderESDChain)
 
@@ -94,7 +94,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChain::ReturnHbtEvent()
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
-  hbtEvent->SetEventNumber(fEvent->GetEventNumber());
+  //hbtEvent->SetEventNumber(fEvent->GetEventNumber());
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.h b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.h
index f0534c828a8cc41828173a46dea7e9cc24756ed2..11e40b1057465f10e3c54c431dc6a5b47486f41f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.h
@@ -3,8 +3,8 @@
 // Adam Kisiel, OSU kisiel@mps.ohio-state.edu
 #ifndef AliFemtoEventReaderESDChain_hh
 #define AliFemtoEventReaderESDChain_hh
-#include "AliFemtoEventReader.h"
-#include "AliFemtoEnumeration.h"
+#include "Base/AliFemtoEventReader.h"
+#include "Infrastructure/AliFemtoEnumeration.h"
 
 #include <string>
 #include <vector>
@@ -43,7 +43,7 @@ class AliFemtoEventReaderESDChain : public AliFemtoEventReader
   list<Int_t>  **fClusterPerPadrow;
                
 #ifdef __ROOT__
-  ClassDef(AliFemtoEventReaderESDChain, 10)
+  ClassDef(AliFemtoEventReaderESDChain, 1)
 #endif
 
     };

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/CorrFctn/AliFemtoShareQualityCorrFctn.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/CorrFctn/AliFemtoShareQualityCorrFctn.cxx
index 8d7a974e11c0b7b7dc76dabc52da441025bcc68f..d93e323a2807426dfb139974be608bb83ed5d65f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/CorrFctn/AliFemtoShareQualityCorrFctn.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/CorrFctn/AliFemtoShareQualityCorrFctn.cxx
@@ -11,6 +11,9 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
  * First version on CVS
  *
@@ -37,7 +40,7 @@
  *
  **************************************************************************/
 
-#include "CorrFctn/AliFemtoShareQualityCorrFctn.h"
+#include "AliFemtoShareQualityCorrFctn.h"
 //#include "Infrastructure/AliFemtoHisto.hh"
 #include <cstdio>
 

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoESDTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoESDTrackCut.cxx
index 5d23e13b2d7f1767ef906a6ad3c0b6c90a5a1c33..175acf0180edf9a05b177a7601a550715e874dce 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoESDTrackCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoESDTrackCut.cxx
@@ -11,6 +11,9 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.4  2007-04-03 16:00:08  mchojnacki
  * Changes to iprove memory managing
  *
@@ -25,7 +28,7 @@
  *
  **************************************************************************/
 
-#include "Cut/AliFemtoESDTrackCut.h"
+#include "AliFemtoESDTrackCut.h"
 #include <cstdio>
 
 #ifdef __ROOT__ 

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoQPairCut.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoQPairCut.cxx
index 4c92d04cc1ca26dc76417044706a3f26f0c1a79b..dfad06b477e361e19602cf9a6791b7490028774b 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoQPairCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoQPairCut.cxx
@@ -7,13 +7,16 @@
  ***************************************************************************
  *
  * $Log$
+ * Revision 1.1.1.1  2007/04/25 15:38:41  panos
+ * Importing the HBT code dir
+ *
  * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
  * First version on CVS
  *
  *
  **************************************************************************/
 
-#include "Cut/AliFemtoQPairCut.h"
+#include "AliFemtoQPairCut.h"
 #include <string>
 #include <cstdio>
 

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoShareQualityPairCut.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoShareQualityPairCut.cxx
index 783749709cd88582b47d2c4273d2f22d6f9654c0..08354fc56d4b84e9ec5f84924356b8f97f3680be 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoShareQualityPairCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/Cut/AliFemtoShareQualityPairCut.cxx
@@ -13,7 +13,7 @@
  *
  **************************************************************************/
 
-#include "Cut/AliFemtoShareQualityPairCut.h"
+#include "AliFemtoShareQualityPairCut.h"
 #include <string>
 #include <cstdio>
 

diff --git a/PWG2/PWG2femtoscopyLinkDef.h b/PWG2/PWG2femtoscopyLinkDef.h
index 86f73675110a928aded10741b12576031073d441..c4601cb34037559a4e74f4c82eda999aa49608c9 100644 (file)
--- a/PWG2/PWG2femtoscopyLinkDef.h
+++ b/PWG2/PWG2femtoscopyLinkDef.h
@@ -26,3 +26,4 @@
 #pragma link C++ class AliFmThreeVectorD;
 #pragma link C++ class AliFmThreeVectorF;
 #pragma link C++ class AliFemtoEventReaderESD;
+#pragma link C++ class AliFemtoEventReaderESDChain;

diff --git a/PWG2/libPWG2femtoscopy.pkg b/PWG2/libPWG2femtoscopy.pkg
index a927d6390ae13cb2520f20279ed823d5c900d895..33633502fcd29eea90e51302731f792ce32a867d 100644 (file)
--- a/PWG2/libPWG2femtoscopy.pkg
+++ b/PWG2/libPWG2femtoscopy.pkg
@@ -46,5 +46,5 @@ DHDR:=PWG2femtoscopyLinkDef.h
 
 EXPORT:=
 
-EINCLUDE:= 
+EINCLUDE:= PWG2/FEMTOSCOPY/AliFemto PWG2/FEMTOSCOPY/AliFemto/Base PWG2/FEMTOSCOPY/AliFemto/Infrastructure PWG2/FEMTOSCOPY/AliFemto/Reader PWG2/FEMTOSCOPY/AliFemto/Cut PWG2/FEMTOSCOPY/AliFemto/CorrFctn PWG2/FEMTOSCOPY/AliFemtoUser PWG2/FEMTOSCOPY/AliFemtoUser/Cut PWG2/FEMTOSCOPY/AliFemtoUser/CorrFctn