Use AliJetDummyGeometry.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 19 Dec 2006 13:53:23 +0000 (13:53 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 19 Dec 2006 13:53:23 +0000 (13:53 +0000)
JETAN/AliJetESDReader.cxx
JETAN/AliJetESDReader.h
JETAN/AliJetFillUnitArrayTracks.h
JETAN/AliJetUnitArray.h
JETAN/JETANLinkDef.h
JETAN/libJETAN.pkg

index 364c8b3..8644482 100755 (executable)
@@ -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");
index e3d8f58..242384b 100755 (executable)
@@ -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 
index f0d1697..08e6356 100644 (file)
@@ -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
index cc0f0d0..79d5fa5 100644 (file)
@@ -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)
 };
index 3cdee9c..1d3d97c 100644 (file)
@@ -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
index 504e204..5d0dde8 100644 (file)
@@ -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