From 5fe305fe722e95d0ecd99b12379b8f9c2d18475e Mon Sep 17 00:00:00 2001 From: alibrary Date: Mon, 3 May 2004 15:50:01 +0000 Subject: [PATCH 1/1] Removing AliESDCaloTrack now obsolete --- MONITOR/AliMonitorITS.cxx | 16 ++++++------ MONITOR/AliMonitorTPC.cxx | 16 ++++++------ PHOS/AliPHOSTrackSegmentMakerv1.h | 1 + STEER/AliESD.cxx | 3 --- STEER/AliESD.h | 11 ++------ STEER/AliESDCaloTrack.cxx | 33 ------------------------ STEER/AliESDCaloTrack.h | 42 ------------------------------- STEER/STEERLinkDef.h | 1 - STEER/libSTEER.pkg | 2 +- 9 files changed, 20 insertions(+), 105 deletions(-) delete mode 100644 STEER/AliESDCaloTrack.cxx delete mode 100644 STEER/AliESDCaloTrack.h diff --git a/MONITOR/AliMonitorITS.cxx b/MONITOR/AliMonitorITS.cxx index 1e87fe7c224..30e78e11fa8 100644 --- a/MONITOR/AliMonitorITS.cxx +++ b/MONITOR/AliMonitorITS.cxx @@ -21,19 +21,19 @@ // // /////////////////////////////////////////////////////////////////////////////// +#include +#include +#include -#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 -#include - +#include "AliRunLoader.h" ClassImp(AliMonitorITS) diff --git a/MONITOR/AliMonitorTPC.cxx b/MONITOR/AliMonitorTPC.cxx index 0fcc98b4913..48743e77edd 100644 --- a/MONITOR/AliMonitorTPC.cxx +++ b/MONITOR/AliMonitorTPC.cxx @@ -21,21 +21,21 @@ // // /////////////////////////////////////////////////////////////////////////////// +#include +#include +#include -#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 -#include - ClassImp(AliMonitorTPC) diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index 0cfe7f8f468..29c60ed8412 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -13,6 +13,7 @@ //*-- Author: Dmitri Peressounko (RRC Ki & SUBATECH) // --- ROOT system --- +#include // --- Standard library --- diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx index 310edb534af..466cab92952 100644 --- 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 f22f761eb65..407d1c890c6 100644 --- a/STEER/AliESD.h +++ b/STEER/AliESD.h @@ -16,7 +16,6 @@ #include #include -#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 index 4f36d26395e..00000000000 --- 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 index dfa0375d7fa..00000000000 --- 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 c619e310aaa..d165b511404 100644 --- 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 4eee1a06cda..b69f93b1b20 100644 --- 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 -- 2.39.3