Removing AliESDCaloTrack now obsolete

diff --git a/MONITOR/AliMonitorITS.cxx b/MONITOR/AliMonitorITS.cxx
index 1e87fe7c224404c365c24e034095949c95a194a8..30e78e11fa8f46fea5d591f7299d07e571097abe 100644 (file)
--- a/MONITOR/AliMonitorITS.cxx
+++ b/MONITOR/AliMonitorITS.cxx
@@ -21,19 +21,19 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TFolder.h>
+#include <TTree.h>
+#include <TVector3.h>
 
-#include "AliMonitorITS.h"
-#include "AliMonitorHisto.h"
-#include "AliITSgeom.h"
+#include "AliESD.h"
 #include "AliITSRawStreamSDD.h"
 #include "AliITSRawStreamSSD.h"
 #include "AliITSclusterV2.h"
-#include "AliRunLoader.h"
+#include "AliITSgeom.h"
+#include "AliMonitorHisto.h"
+#include "AliMonitorITS.h"
 #include "AliRawReader.h"
-#include "AliESD.h"
-#include <TFolder.h>
-#include <TTree.h>
-
+#include "AliRunLoader.h"
 
 ClassImp(AliMonitorITS) 
 

diff --git a/MONITOR/AliMonitorTPC.cxx b/MONITOR/AliMonitorTPC.cxx
index 0fcc98b49133ac21e0e85a9bbedee2c0a41eb004..48743e77eddea090ded4292ab4f78c09b6540bcd 100644 (file)
--- a/MONITOR/AliMonitorTPC.cxx
+++ b/MONITOR/AliMonitorTPC.cxx
@@ -21,21 +21,21 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TFolder.h>
+#include <TTree.h>
+#include <TVector3.h>
 
-#include "AliMonitorTPC.h"
+#include "AliESD.h"
 #include "AliMonitorDataTPC.h"
 #include "AliMonitorHisto.h"
+#include "AliMonitorTPC.h"
 #include "AliMonitorTrend.h"
+#include "AliRawReader.h"
+#include "AliRunLoader.h"
+#include "AliTPCClustersRow.h"
 #include "AliTPCParam.h"
 #include "AliTPCRawStream.h"
-#include "AliTPCClustersRow.h"
 #include "AliTPCclusterMI.h"
-#include "AliRunLoader.h"
-#include "AliRawReader.h"
-#include "AliESD.h"
-#include <TFolder.h>
-#include <TTree.h>
-
 
 ClassImp(AliMonitorTPC) 
 

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index 0cfe7f8f46827d848d6e50650cae7880681b356f..29c60ed84124e9c826742f5a96b009f5d0f59641 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -13,6 +13,7 @@
 //*-- Author: Dmitri Peressounko (RRC Ki & SUBATECH)
 
 // --- ROOT system ---
+#include <TVector3.h>
 
 // --- Standard library ---
 

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index 310edb534af46d1a9aca3b209616f51e34ca87dd..466cab92952fcfa1263379bf4e534d97035c9e4c 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -36,7 +36,6 @@ AliESD::AliESD():
   fT0zVertex(0),
   fPrimaryVertex(),
   fTracks("AliESDtrack",15000),
-  fCaloTracks("AliESDCaloTrack",500),
   fMuonTracks("AliESDMuonTrack",30),
   fPmdTracks("AliESDPmdTrack",3000),
   fV0s("AliESDv0",200),
@@ -51,7 +50,6 @@ AliESD::~AliESD()
   // Standard destructor
   //
   fTracks.Delete();
-  fCaloTracks.Delete();
   fMuonTracks.Delete();
   fPmdTracks.Delete();
   fV0s.Delete();
@@ -78,7 +76,6 @@ void AliESD::Print(Option_t *) const
   printf("Event from reconstruction version %d \n",fRecoVersion);
   printf("Number of tracks: \n");
   printf("                 charged   %d\n",GetNumberOfTracks());
-  printf("                 calo      %d\n", GetNumberOfCaloTracks());
   printf("                 muon      %d\n", GetNumberOfMuonTracks());
   printf("                 pmd      %d\n", GetNumberOfPmdTracks());
   printf("                 v0        %d\n", GetNumberOfV0s());

diff --git a/STEER/AliESD.h b/STEER/AliESD.h
index f22f761eb65aedda7adaea2cf94ddb6d7b4b63c9..407d1c890c6030034a419cfb7ebfb1812e8631e8 100644 (file)
--- a/STEER/AliESD.h
+++ b/STEER/AliESD.h
@@ -16,7 +16,6 @@
 #include <TClonesArray.h>
 #include <TObject.h>
 
-#include "AliESDCaloTrack.h"
 #include "AliESDMuonTrack.h"
 #include "AliESDPmdTrack.h"
 #include "AliESDVertex.h"
@@ -38,9 +37,7 @@ public:
   AliESDtrack *GetTrack(Int_t i) const {
     return (AliESDtrack *)fTracks.UncheckedAt(i);
   }
-  AliESDCaloTrack *GetCaloTrack(Int_t i) const {
-    return (AliESDCaloTrack *)fCaloTracks.UncheckedAt(i);
-  }
+
   AliESDMuonTrack *GetMuonTrack(Int_t i) const {
     return (AliESDMuonTrack *)fMuonTracks.UncheckedAt(i);
   }
@@ -51,9 +48,7 @@ public:
   void AddTrack(const AliESDtrack *t) {
     new(fTracks[fTracks.GetEntriesFast()]) AliESDtrack(*t);
   }
-  void AddCaloTrack(const AliESDCaloTrack *t) {
-    new(fCaloTracks[fCaloTracks.GetEntriesFast()]) AliESDCaloTrack(*t);
-  }
+
   void AddMuonTrack(const AliESDMuonTrack *t) {
     new(fMuonTracks[fMuonTracks.GetEntriesFast()]) AliESDMuonTrack(*t);
   }
@@ -85,7 +80,6 @@ public:
   Long_t GetTrigger() const {return fTrigger;}
   
   Int_t GetNumberOfTracks()     const {return fTracks.GetEntriesFast();}
-  Int_t GetNumberOfCaloTracks() const {return fCaloTracks.GetEntriesFast();}
   Int_t GetNumberOfMuonTracks() const {return fMuonTracks.GetEntriesFast();}
   Int_t GetNumberOfPmdTracks() const {return fPmdTracks.GetEntriesFast();}
   Int_t GetNumberOfV0s()      const {return fV0s.GetEntriesFast();}
@@ -109,7 +103,6 @@ protected:
   AliESDVertex  fPrimaryVertex;  // Primary vertex estimated by the ITS
 
   TClonesArray  fTracks;         // ESD tracks
-  TClonesArray  fCaloTracks;     // Calorimeters' ESD tracks
   TClonesArray  fMuonTracks;     // MUON ESD tracks
   TClonesArray  fPmdTracks;      // PMD ESD tracks
   TClonesArray  fV0s;            // V0 vertices

diff --git a/STEER/AliESDCaloTrack.cxx b/STEER/AliESDCaloTrack.cxx
deleted file mode 100644 (file)
index 4f36d26..0000000
--- a/STEER/AliESDCaloTrack.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-2002, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- *                                                                        *
- **************************************************************************/
-
-/* $Id$ */
-#include "AliESDCaloTrack.h"
-
-//-------------------------------------------------------------------------
-//   Class AliESDCaloTrack
-//   This is the class to deal with during the physical analysis of data
-//   It converts calorimeter (PHOS or EMCAL) reconstructed particles   
-//   into event summary data object
-//-------------------------------------------------------------------------
-
-ClassImp(AliESDCaloTrack)
-
-AliESDCaloTrack::AliESDCaloTrack(TParticle* recpart)
-{
-  // Convert AliPHOSRecParticle to AliESDCaloTrack
-  fRecParticle = recpart;
-}

diff --git a/STEER/AliESDCaloTrack.h b/STEER/AliESDCaloTrack.h
deleted file mode 100644 (file)
index dfa0375..0000000
--- a/STEER/AliESDCaloTrack.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef ALIESDCALOTRACK_H
-#define ALIESDCALOTRACK_H
-/* Copyright(c) 1998-2002, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-//-------------------------------------------------------------------------
-//   Class AliESDCaloTrack
-//   This is the class to deal with during the physical analysis of data
-//   It converts calorimeter (PHOS or EMCAL) reconstructed particles   
-//   into event summary data object
-//-------------------------------------------------------------------------
-
-#include "TObject.h"
-#include "TParticle.h"
-
-class AliESDCaloTrack : public TObject {
-
-public:
-  AliESDCaloTrack(): TObject(), fRecParticle(0) {}
-  AliESDCaloTrack(const AliESDCaloTrack &act): TObject(act)
-    {fRecParticle = act.fRecParticle;}
-  virtual ~AliESDCaloTrack() {
-    //PH    delete fRecParticle;
-  }
-  AliESDCaloTrack(TParticle* recpart);
-  Float_t Px() const { return fRecParticle->Px(); }
-  Float_t Py() const { return fRecParticle->Py(); }
-  Float_t Pz() const { return fRecParticle->Pz(); }
-
-  TParticle * GetRecParticle() const {return fRecParticle;}
-
-private:
-  AliESDCaloTrack & operator=(const AliESDCaloTrack &)
-    {Fatal("= operator","Not implemented\n"); return *this;}
-  TParticle *fRecParticle; // reconstructed particle from PHOS or EMCAL
-
-  ClassDef(AliESDCaloTrack,2)  //ESD calorimeter track class 
-};
-
-#endif 

diff --git a/STEER/STEERLinkDef.h b/STEER/STEERLinkDef.h
index c619e310aaabef353d84f8dc3adfdf7d48a766ea..d165b5114042d7d61af172e9da1512abb0ba1597 100644 (file)
--- a/STEER/STEERLinkDef.h
+++ b/STEER/STEERLinkDef.h
@@ -66,7 +66,6 @@
 #pragma link C++ class  AliTrackReference+;
 #pragma link C++ class  AliESD+;
 #pragma link C++ class  AliESDtrack+;
-#pragma link C++ class  AliESDCaloTrack+;
 #pragma link C++ class  AliESDMuonTrack+;
 #pragma link C++ class  AliESDPmdTrack+;
 #pragma link C++ class  AliReconstructor+;

diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg
index 4eee1a06cda1e31224be69c822c9d13a5d2b1ed4..b69f93b1b20643b970af0d914df864b44367b347 100644 (file)
--- a/STEER/libSTEER.pkg
+++ b/STEER/libSTEER.pkg
@@ -16,7 +16,7 @@ AliMergeCombi.cxx AliMagFMaps.cxx AliFieldMap.cxx \
 AliGausCorr.cxx AliTrackReference.cxx AliESD.cxx \
 AliTrackMap.cxx AliTrackMapper.cxx AliCollisionGeometry.cxx \
 AliMemoryWatcher.cxx AliBarrelTrack.cxx \
-AliESDtrack.cxx AliESDCaloTrack.cxx AliESDMuonTrack.cxx AliESDPmdTrack.cxx AliESDv0.cxx AliESDcascade.cxx AliESDVertex.cxx AliESDpid.cxx \
+AliESDtrack.cxx AliESDMuonTrack.cxx AliESDPmdTrack.cxx AliESDv0.cxx AliESDcascade.cxx AliESDVertex.cxx AliESDpid.cxx \
 AliVertexer.cxx \
 AliMC.cxx AliSimulation.cxx AliReconstruction.cxx AliVertexGenFile.cxx \
 AliReconstructor.cxx