Use AliJetDummyGeometry.

diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx
index 364c8b308e65de6bdbada97aab129f76dfa02621..86444828a347c0ccc341a9eb02b9343a8f386c65 100755 (executable)
--- a/JETAN/AliJetESDReader.cxx
+++ b/JETAN/AliJetESDReader.cxx
@@ -31,7 +31,8 @@
 #include "AliJetESDReaderHeader.h"
 #include "AliESD.h"
 #include "AliESDtrack.h"
-#include "AliEMCALGeometry.h"
+//#include "AliEMCALGeometry.h"
+#include "AliJetDummyGeo.h"
 #include "AliJetFillUnitArrayTracks.h"
 #include "AliJetUnitArray.h"
 
@@ -221,9 +222,9 @@ Bool_t AliJetESDReader::FillMomentumArray(Int_t event)
 void AliJetESDReader::SetEMCALGeometry()
 {
   // Define EMCAL geometry to be able to read ESDs
-    fGeom = AliEMCALGeometry::GetInstance();
+    fGeom = AliJetDummyGeo::GetInstance();
     if (fGeom == 0)
-       fGeom = AliEMCALGeometry::GetInstance("SHISH_77_TRD1_2X2_FINAL_110DEG","EMCAL");
+       fGeom = AliJetDummyGeo::GetInstance("SHISH_77_TRD1_2X2_FINAL_110DEG","EMCAL");
     
     // To be setted to run some AliEMCALGeometry functions
     TGeoManager::Import("geometry.root");

diff --git a/JETAN/AliJetESDReader.h b/JETAN/AliJetESDReader.h
index e3d8f58dcac470f95124f57b944abd49e2ad21f6..242384b387c981e61a7cf2326c5dfd15486ebcda 100755 (executable)
--- a/JETAN/AliJetESDReader.h
+++ b/JETAN/AliJetESDReader.h
@@ -19,6 +19,7 @@
 #include "AliJetGrid.h"
 class AliJetESDReaderHeader;
 class AliEMCALGeometry;
+class AliJetDummyGeo;
 class AliJetHadronCorrection;
 class AliJetUnitArray;
 class AliJetReaderHeader;
@@ -43,7 +44,7 @@ class AliJetESDReader : public AliJetReader
   void SetEMCALGeometry();
   void InitParameters();
  protected:
-  AliEMCALGeometry           *fGeom;             //!EMCAL Geometry 
+  AliJetDummyGeo             *fGeom;             //!EMCAL Geometry 
   TChain                     *fChain;            // chain for reconstructed tracks
   AliESD                     *fESD;              // pointer to esd
   AliJetHadronCorrectionv1   *fHadCorr;          // Pointer to Hadron Correction Object 

diff --git a/JETAN/AliJetFillUnitArrayTracks.h b/JETAN/AliJetFillUnitArrayTracks.h
index f0d1697d19bf6a1d9e3fbb4bccc6982089ec3f06..08e6356b9a04b0532e15b9a06861075223b9cd6a 100644 (file)
--- a/JETAN/AliJetFillUnitArrayTracks.h
+++ b/JETAN/AliJetFillUnitArrayTracks.h
@@ -18,6 +18,7 @@
 #include <TArrayD.h>
 
 class AliEMCALGeometry;
+class AliJetDummyGeo;
 class AliJetHadronCorrection;
 class AliJetReader;
 class AliJetESDReader;
@@ -71,7 +72,7 @@ class AliJetFillUnitArrayTracks : public TTask
   AliJetGrid                  *fEMCalGrid;      // Define filled grid
 
   // geometry info
-  static AliEMCALGeometry *fGeom;     //!
+  AliJetDummyGeo              *fGeom;           //!
 
   Int_t     fNphi;                    // number of points in the grid:   phi
   Int_t     fNeta;                    //               "                 eta

diff --git a/JETAN/AliJetUnitArray.h b/JETAN/AliJetUnitArray.h
index cc0f0d0856a583c4b72d8b79d7e61b9c0399663d..79d5fa512b145a9e9897ccbc8167b54e5890b755 100644 (file)
--- a/JETAN/AliJetUnitArray.h
+++ b/JETAN/AliJetUnitArray.h
@@ -89,10 +89,10 @@ class AliJetUnitArray : public TObject
   Int_t           fUnitID;            // ID of the unit
   Int_t           fUnitNum;           // number of units
   Int_t           fUnitClusterID;     // ID of the unit
-  AliJetFinderUnitFlagType_t         fUnitFlag; //Flag of the unit
-  AliJetFinderUnitCutFlagType_t      fUnitCutFlag; //Flag of the unit
-  AliJetFinderUnitSignalFlagType_t   fUnitSignalFlag; //Flag of the unit
-  AliJetFinderUnitDetectorFlagType_t fUnitDetectorFlag; // Detector flag of the unit
+  AliJetFinderUnitFlagType_t         fUnitFlag;          // Flag of the unit
+  AliJetFinderUnitCutFlagType_t      fUnitCutFlag;       // Flag of the unit
+  AliJetFinderUnitSignalFlagType_t   fUnitSignalFlag;    // Flag of the unit
+  AliJetFinderUnitDetectorFlagType_t fUnitDetectorFlag;  // Detector flag of the unit
 
   ClassDef(AliJetUnitArray,3)
 };

diff --git a/JETAN/JETANLinkDef.h b/JETAN/JETANLinkDef.h
index 3cdee9c207c1132abb87e9e3f4a6617b27493b78..1d3d97c345c312b5e81c0a181eeca544f6a25e5c 100644 (file)
--- a/JETAN/JETANLinkDef.h
+++ b/JETAN/JETANLinkDef.h
@@ -26,4 +26,5 @@
 #pragma link C++ class AliJetHadronCorrectionv0+;
 #pragma link C++ class AliJetHadronCorrectionv1+; 
 #pragma link C++ class AliJetFillUnitArrayTracks+;
+#pragma link C++ class AliJetDummyGeo+;
 #endif

diff --git a/JETAN/libJETAN.pkg b/JETAN/libJETAN.pkg
index 504e2045f3475448fc9518afd6ea455fb743704c..5d0dde8e07dc954ec282552910ca7978daa5381d 100644 (file)
--- a/JETAN/libJETAN.pkg
+++ b/JETAN/libJETAN.pkg
@@ -10,10 +10,10 @@ SRCS =      AliJet.cxx AliJetHeader.cxx \
        AliUA1JetFinderV1.cxx AliUA1JetHeaderV1.cxx \
        AliJetGrid.cxx AliJetUnitArray.cxx AliJetHadronCorrection.cxx \
        AliJetHadronCorrectionv0.cxx AliJetHadronCorrectionv1.cxx \
-       AliJetFillUnitArrayTracks.cxx
+       AliJetFillUnitArrayTracks.cxx \
+       AliJetDummyGeo.cxx
 
 
 HDRS:= $(SRCS:.cxx=.h)
-EINCLUDE:= EMCAL
 DHDR= JETANLinkDef.h