From 8dd1cfa6be784c5d01dcf3c53c16c7f7d76b4ad0 Mon Sep 17 00:00:00 2001 From: nilsen Date: Thu, 4 Oct 2001 22:40:15 +0000 Subject: [PATCH] Cosmetic changes. --- ITS/AliITSDetType.cxx | 5 ++ ITS/AliITSDetType.h | 139 ++++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 67 deletions(-) diff --git a/ITS/AliITSDetType.cxx b/ITS/AliITSDetType.cxx index 53c30764283..b9413f254d1 100644 --- a/ITS/AliITSDetType.cxx +++ b/ITS/AliITSDetType.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.7 2001/09/07 14:43:15 hristov + Destructor reverted after a temporary fix + Revision 1.6 2001/09/07 08:44:43 hristov Deletion commented out because AliITSDetType was not the owner @@ -35,6 +38,7 @@ ClassImp(AliITSDetType) +//______________________________________________________________________ AliITSDetType::AliITSDetType(){ // constructor @@ -46,6 +50,7 @@ AliITSDetType::AliITSDetType(){ //---------------------------------------------------------------------- AliITSDetType::~AliITSDetType(){ // destructor + if(fSegmentation!=0) delete fSegmentation; fSegmentation = 0; // if(fResponse!=0) delete fResponse; fResponse = 0; if(fSimulation!=0) delete fSimulation; fSimulation = 0; diff --git a/ITS/AliITSDetType.h b/ITS/AliITSDetType.h index 35a0bd93cbb..ac76063787c 100644 --- a/ITS/AliITSDetType.h +++ b/ITS/AliITSDetType.h @@ -1,6 +1,17 @@ #ifndef ALIITSDETTYPE_H #define ALIITSDETTYPE_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ +/* $Id$ */ + +//////////////////////////////////////////////////////////////////////// +// This Class owns the classes needed to to detector simulations and +// reconstruction. This includes the detector segmentation classes, +// the detector responce classes, the detector simulatin classes, and +// the detector reconstruction (clustering) classes for all of the ITS +// detectors. +//////////////////////////////////////////////////////////////////////// #include #include @@ -8,12 +19,10 @@ #include "AliITSsegmentation.h" #include "AliITSresponse.h" - class AliITSClusterFinder; class AliITSsimulation; -class AliITSDetType:public TObject -{ +class AliITSDetType:public TObject{ public: AliITSDetType(); @@ -21,72 +30,68 @@ class AliITSDetType:public TObject AliITSDetType(const AliITSDetType &source); // copy constructor AliITSDetType& operator=(const AliITSDetType &source); // assign. operator -// Set the defaults - virtual void Init() {} - -// - virtual void SegmentationModel(AliITSsegmentation* thisSegmentation){ - // Configure segmentation model - if(fSegmentation) delete fSegmentation; - fSegmentation=thisSegmentation; - } - // - virtual void ResponseModel(AliITSresponse* thisResponse) { - // Configure response model - if(fResponse) delete fResponse; - fResponse=thisResponse; - } - // - virtual void SimulationModel(AliITSsimulation *thisSimulation) { - // Configure simulation model - fSimulation = thisSimulation; - } - // - virtual void ReconstructionModel(AliITSClusterFinder *thisReconstruction) { -// Configure reconstruction model - fReconst = thisReconstruction; - } - virtual void ClassNames(const char *digit, const char *cluster) { - // Set class names for digits and clusters - fDigClassName=digit; fClustClassName=cluster; - } - - AliITSsegmentation* &GetSegmentationModel(){ - // Get reference to segmentation model - return fSegmentation; - } - AliITSresponse* &GetResponseModel(){ - // Get reference to response model - return fResponse; - } - AliITSsimulation* &GetSimulationModel(){ - // Get reference to simulation model - return fSimulation; - } - AliITSClusterFinder* &GetReconstructionModel(){ - // Get reference to hit reconstruction model - return fReconst; - } - // - - void GetClassNames(char *digit,char *cluster) - { - // Get class names for digits and rec points - strcpy(digit,fDigClassName.Data()); strcpy(cluster,fClustClassName.Data()); + // Set the defaults + virtual void Init() {} + // + virtual void SegmentationModel(AliITSsegmentation* thisSegmentation){ + // Configure segmentation model + if(fSegmentation) delete fSegmentation; + fSegmentation=thisSegmentation; + } + // + virtual void ResponseModel(AliITSresponse* thisResponse) { + // Configure response model + if(fResponse) delete fResponse; + fResponse=thisResponse; + } + // + virtual void SimulationModel(AliITSsimulation *thisSimulation) { + // Configure simulation model + fSimulation = thisSimulation; + } + // + virtual void ReconstructionModel(AliITSClusterFinder *thisReconstruction) { + // Configure reconstruction model + fReconst = thisReconstruction; + } + virtual void ClassNames(const char *digit, const char *cluster) { + // Set class names for digits and clusters + fDigClassName=digit; fClustClassName=cluster; + } + AliITSsegmentation* &GetSegmentationModel(){ + // Get reference to segmentation model + return fSegmentation; + } + AliITSresponse* &GetResponseModel(){ + // Get reference to response model + return fResponse; + } + AliITSsimulation* &GetSimulationModel(){ + // Get reference to simulation model + return fSimulation; + } + AliITSClusterFinder* &GetReconstructionModel(){ + // Get reference to hit reconstruction model + return fReconst; + } + // + void GetClassNames(char *digit,char *cluster){ + // Get class names for digits and rec points + strcpy(digit,fDigClassName.Data()); + strcpy(cluster,fClustClassName.Data()); } -protected: - - AliITSClusterFinder *fReconst; // cluster finder - AliITSsimulation *fSimulation; // simulation - AliITSresponse *fResponse; // response - AliITSsegmentation *fSegmentation; // segmentation - - TString fDigClassName; // string - TString fClustClassName; // string - - ClassDef(AliITSDetType,1) - + protected: + AliITSresponse *fResponse; // response + AliITSsegmentation *fSegmentation; // segmentation + AliITSsimulation *fSimulation; // simulation + AliITSClusterFinder *fReconst; // cluster finder + + TString fDigClassName; // string + TString fClustClassName; // string + + ClassDef(AliITSDetType,1) //Detector simulation/reconstruction class holder + }; #endif -- 2.43.0