Introducing some effective C++ suggestions

diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx
index 2064e8a9ac6b0d0ee64b380bc7ab1db4ce686bec..4df26f526a1ff4e894277b20320c0862d590ad69 100644 (file)
--- a/STEER/AliConfig.cxx
+++ b/STEER/AliConfig.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  2002/10/22 15:02:15  alibrary
+Introducing Riostream.h
+
 Revision 1.5  2002/10/14 14:57:32  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
@@ -65,20 +68,19 @@ AliConfig* AliConfig::Instance ()
 }
 
 //____________________________________________________________________________
-AliConfig::AliConfig(): TNamed("","")
+AliConfig::AliConfig():
+  fTopFolder(0),
+  fTasks(0),
+  fPDGFolder(0),
+  fGeneratorFolder(0),
+  fMCFolder(0),
+  fModuleFolder(0),
+  fDetectorFolder(0),
+  fDetectorTask(0)
 {
   //
   // Default constructor, mainly to keep coding conventions
   //
-  fTopFolder=0;
-  fTasks=0;
-
-  fPDGFolder=0; 
-  fGeneratorFolder=0; 
-  fMCFolder=0; 
-  fModuleFolder=0; 
-  fDetectorFolder=0;
-  fDetectorTask=0; 
   fInstance=0;
     
   Fatal("ctor",
@@ -86,20 +88,19 @@ AliConfig::AliConfig(): TNamed("","")
 }
 
 //____________________________________________________________________________
-AliConfig::AliConfig(const AliConfig&): TNamed("","")
+AliConfig::AliConfig(const AliConfig&):
+  fTopFolder(0),
+  fTasks(0),
+  fPDGFolder(0),
+  fGeneratorFolder(0),
+  fMCFolder(0),
+  fModuleFolder(0),
+  fDetectorFolder(0),
+  fDetectorTask(0)
 {
   //
   // Copy constructor, mainly to keep coding conventions
   //
-  fTopFolder=0;
-  fTasks=0;
-
-  fPDGFolder=0; 
-  fGeneratorFolder=0; 
-  fMCFolder=0; 
-  fModuleFolder=0; 
-  fDetectorFolder=0;
-  fDetectorTask=0; 
   fInstance=0;
     
   Fatal("copy ctor",

diff --git a/STEER/AliDebugVolume.cxx b/STEER/AliDebugVolume.cxx
index dc0e23593e1afea1b6c58ba3430a7867890630d3..f16da06e0dd43304c3da1af2de5030e7fe8901f8 100644 (file)
--- a/STEER/AliDebugVolume.cxx
+++ b/STEER/AliDebugVolume.cxx
@@ -1,4 +1,4 @@
-/*
+/**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.1  2001/05/11 13:21:16  morsch
+Geom. volume data class. Can be used during lego run for debugging.
+
 */
 
 #include "AliDebugVolume.h"
@@ -22,64 +25,49 @@ $Log$
 ClassImp(AliDebugVolume)
 
 
-
-AliDebugVolume::AliDebugVolume()
+//_______________________________________________________________________
+AliDebugVolume::AliDebugVolume():
+  fCopy(0),
+  fStep(0),
+  fX(0),
+  fY(0),
+  fZ(0),
+  fStatus(0)
 {
   //
   // Default constructor
   //
 }
 
-
-AliDebugVolume::AliDebugVolume(const char *name,
-                Int_t copy, Float_t step, Float_t x, Float_t y, Float_t z, Int_t status)
-    : TNamed(name, "Debug Volume")
+//_______________________________________________________________________
+AliDebugVolume::AliDebugVolume(const char *name, Int_t copy, Float_t step, 
+                               Float_t x, Float_t y, Float_t z, Int_t status):
+  TNamed(name, "Debug Volume"),
+  fCopy(copy),
+  fStep(step),
+  fX(x),
+  fY(y),
+  fZ(z),
+  fStatus(status)
 {
-//
-// Constructor
-//
-    fCopy = copy;
-    fX    = x;
-    fY    = y;
-    fZ    = z;
-    fStep = step;
-    fStatus = status;
+  //
+  // Normal constructor
+  //
 }
 
 
-
-Bool_t  AliDebugVolume::IsEqual(const char* name, const Int_t copy)
+//_______________________________________________________________________
+Bool_t  AliDebugVolume::IsEqual(const char* name, const Int_t copy) const
 {
-    return (copy == fCopy && strcmp(name, fName) == 0);
+  return (copy == fCopy && strcmp(name, fName) == 0);
 }
 
+//_______________________________________________________________________
 char*   AliDebugVolume::Status() const
 {
-    char* tmp;
-    tmp = "Undefined";
-    if (fStatus == 1) tmp = "Entering";
-    if (fStatus == 2) tmp = "Exiting";   
-    return tmp;
-}
-
-
-void AliDebugVolume::Copy(AliDebugVolume &volume) const
-{
-  //
-  // Copy *this onto debug volume -- not implemented
-  //
-  Fatal("Copy","Not implemented!\n");
+  char* tmp;
+  tmp = "Undefined";
+  if (fStatus == 1) tmp = "Entering";
+  if (fStatus == 2) tmp = "Exiting";   
+  return tmp;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/STEER/AliDebugVolume.h b/STEER/AliDebugVolume.h
index e324b311f9645c6ec3ab329cac56eea867037bf8..19e22371a999b74992fb1e4d09bd94e96f7139dd 100644 (file)
--- a/STEER/AliDebugVolume.h
+++ b/STEER/AliDebugVolume.h
@@ -12,13 +12,8 @@ public:
   AliDebugVolume();
   AliDebugVolume(const char *name, Int_t copy,
                 Float_t step, Float_t x, Float_t y, Float_t z, Int_t status);
-  AliDebugVolume(const AliDebugVolume &volume) {volume.Copy(*this);}
-  virtual ~AliDebugVolume(){;}
+  virtual ~AliDebugVolume(){}
   
-  void  Copy(AliDebugVolume &lego) const;
-  virtual AliDebugVolume &operator=(const AliDebugVolume &volume) 
-  {volume.Copy(*this); return(*this);}
-
   Int_t   CopyNumber() const {return fCopy;}
   Float_t Step()       const {return fStep;}
   Float_t X()          const {return fX;}  
@@ -27,7 +22,7 @@ public:
   char*   Status()     const;
   
   
-  Bool_t  IsEqual(const char* name, const Int_t copy);
+  Bool_t  IsEqual(const char* name, const Int_t copy) const;
 private:
    Int_t      fCopy;             //!Volume copy number
    Float_t    fStep;             //!Stepsize to volume boundary

diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx
index 0ed3ddcf89cd4f1d7427ab60ed3765f6197cc906..1e2c2eec0cf00e8a3763658cd8aad69b50e5c21a 100644 (file)
--- a/STEER/AliDetector.cxx
+++ b/STEER/AliDetector.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.21  2002/10/22 15:02:15  alibrary
+Introducing Riostream.h
+
 Revision 1.20  2002/10/14 14:57:32  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
@@ -87,19 +90,19 @@ Introduction of the Copyright and cvs Log
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <assert.h>
-#include <Riostream.h>
 
-#include <TTree.h>
 #include <TBrowser.h>
 #include <TFile.h>
-#include <TROOT.h>
 #include <TFolder.h>
+#include <TROOT.h>
+#include <TTree.h>
+#include <Riostream.h>
 
 #include "AliConfig.h"
 #include "AliDetector.h"
-#include "AliRun.h"
 #include "AliHit.h"
 #include "AliPoints.h"
+#include "AliRun.h"
 #include "AliTrackReference.h"
 
 
@@ -110,25 +113,41 @@ static Int_t sCurIterHit=0;
 
 ClassImp(AliDetector)
  
-//_____________________________________________________________________________
-AliDetector::AliDetector()
+//_______________________________________________________________________
+AliDetector::AliDetector():
+  fTimeGate(200.e-9),
+  fIshunt(0),
+  fNhits(0),
+  fNdigits(0),
+  fBufferSize(1600),
+  fHits(0),
+  fDigits(0),
+  fDigitsFile(0),
+  fPoints(0),
+  fTrackReferences(0),
+  fMaxIterTrackRef(0),
+  fCurrentIterTrackRef(0)
 {
   //
   // Default constructor for the AliDetector class
   //
-  fNhits      = 0;
-  fNdigits    = 0;
-  fPoints     = 0;
-  fHits       = 0;
-  fTrackReferences =0;
-  fDigits     = 0;
-  fTimeGate   = 200.e-9;
-  fBufferSize = 16000;
-  fDigitsFile = 0;
 }
  
 //_____________________________________________________________________________
-AliDetector::AliDetector(const char* name,const char *title):AliModule(name,title)
+AliDetector::AliDetector(const char* name,const char *title):
+  AliModule(name,title),
+  fTimeGate(200.e-9),
+  fIshunt(0),
+  fNhits(0),
+  fNdigits(0),
+  fBufferSize(1600),
+  fHits(0),
+  fDigits(0),
+  fDigitsFile(0),
+  fPoints(0),
+  fTrackReferences(new TClonesArray("AliTrackReference", 100)),
+  fMaxIterTrackRef(0),
+  fCurrentIterTrackRef(0)
 {
   //
   // Normal constructor invoked by all Detectors.
@@ -136,33 +155,18 @@ AliDetector::AliDetector(const char* name,const char *title):AliModule(name,titl
   // Add this Detector to the global list of Detectors in Run.
   //
 
-  fTimeGate   = 200.e-9;
   fActive     = kTRUE;
-  fNhits      = 0;
-  fHits       = 0;
-  fTrackReferences =0;
-  fDigits     = 0;
-  fNdigits    = 0;
-  fPoints     = 0;
-  fBufferSize = 16000;
-  fDigitsFile = 0;
-
   AliConfig::Instance()->Add(this);
 
-  fTrackReferences        = new TClonesArray("AliTrackReference", 100);
-  //if detector to want to create another track reference - than let's be free 
-  
 }
  
-//_____________________________________________________________________________
+//_______________________________________________________________________
 AliDetector::~AliDetector()
 {
   //
   // Destructor
   //
-  fNhits      = 0;
-  fNdigits    = 0;
-  //
+
   // Delete space point structure
   if (fPoints) {
     fPoints->Delete();
@@ -178,7 +182,7 @@ AliDetector::~AliDetector()
   if (fDigitsFile) delete [] fDigitsFile;
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::Publish(const char *dir, void *address, const char *name)
 {
   //
@@ -208,14 +212,19 @@ void AliDetector::Publish(const char *dir, void *address, const char *name)
   }
 }
 
-//_____________________________________________________________________________
-TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name, void* address, Int_t size,const char *file)
+//_______________________________________________________________________
+TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name, 
+                                       void* address, Int_t size,
+                                       const char *file)
 { 
     return(MakeBranchInTree(tree,name,0,address,size,99,file));
 }
 
-//_____________________________________________________________________________
-TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name, const char *classname, void* address,Int_t size, Int_t splitlevel, const char *file)
+//_______________________________________________________________________
+TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name, 
+                                       const char *classname, 
+                                       void* address,Int_t size, 
+                                       Int_t splitlevel, const char *file)
 { 
     //
     // Makes branch in given tree and diverts them to a separate file
@@ -279,7 +288,7 @@ TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name, const char
     return branch;
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::Browse(TBrowser *b)
 {
   //
@@ -298,7 +307,7 @@ void AliDetector::Browse(TBrowser *b)
   }
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::Copy(AliDetector &det) const
 {
   //
@@ -307,7 +316,7 @@ void AliDetector::Copy(AliDetector &det) const
   Fatal("Copy","Not implemented~\n");
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::FinishRun()
 {
   //
@@ -315,13 +324,13 @@ void AliDetector::FinishRun()
   //
 }
 
-
-
+//_______________________________________________________________________
 void AliDetector::RemapTrackReferencesIDs(Int_t *map)
 {
   // 
-  //remaping track reference
-  //called at finish primary
+  // Remapping track reference
+  // Called at finish primary
+  //
   if (!fTrackReferences) return;
   for (Int_t i=0;i<fTrackReferences->GetEntries();i++){
     AliTrackReference * ref = (AliTrackReference*) fTrackReferences->UncheckedAt(i);
@@ -334,7 +343,7 @@ void AliDetector::RemapTrackReferencesIDs(Int_t *map)
   }
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 AliHit* AliDetector::FirstHit(Int_t track)
 {
   //
@@ -356,7 +365,7 @@ AliHit* AliDetector::FirstHit(Int_t track)
 }
 
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 AliTrackReference* AliDetector::FirstTrackReference(Int_t track)
 {
   //
@@ -377,9 +386,7 @@ AliTrackReference* AliDetector::FirstTrackReference(Int_t track)
   else            return 0;
 }
 
-
-
-//_____________________________________________________________________________
+//_______________________________________________________________________
 AliHit* AliDetector::NextHit()
 {
   //
@@ -395,7 +402,8 @@ AliHit* AliDetector::NextHit()
     return 0;
   }
 }
-//_____________________________________________________________________________
+
+//_______________________________________________________________________
 AliTrackReference* AliDetector::NextTrackReference()
 {
   //
@@ -412,7 +420,7 @@ AliTrackReference* AliDetector::NextTrackReference()
   }
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::LoadPoints(Int_t)
 {
   //
@@ -482,7 +490,7 @@ void AliDetector::LoadPoints(Int_t)
   delete [] limi;
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::MakeBranch(Option_t *option, const char *file)
 {
   //
@@ -510,7 +518,7 @@ void AliDetector::MakeBranch(Option_t *option, const char *file)
     }
   }
 }
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::MakeBranchTR(Option_t *option, const char *file)
 {
   //
@@ -530,7 +538,7 @@ void AliDetector::MakeBranchTR(Option_t *option, const char *file)
   }      
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::ResetDigits()
 {
   //
@@ -540,7 +548,7 @@ void AliDetector::ResetDigits()
   if (fDigits)   fDigits->Clear();
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::ResetHits()
 {
   //
@@ -550,9 +558,7 @@ void AliDetector::ResetHits()
   if (fHits)   fHits->Clear();
 }
 
-
-
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::ResetTrackReferences()
 {
   //
@@ -562,9 +568,7 @@ void AliDetector::ResetTrackReferences()
   if (fTrackReferences)   fTrackReferences->Clear();
 }
 
-
-
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::ResetPoints()
 {
   //
@@ -577,7 +581,7 @@ void AliDetector::ResetPoints()
   }
 }
 
-//_____________________________________________________________________________
+//_______________________________________________________________________
 void AliDetector::SetTreeAddress()
 {
   //
@@ -607,8 +611,6 @@ void AliDetector::SetTreeAddress()
     branch = treeTR->GetBranch(branchname);
     if (branch) branch->SetAddress(&fTrackReferences);
   }
-
-
 }
 
  

diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h
index 5b006a6cfb9b4eee9df4362fae401c44d9f4a9f8..e9d81d5cc18d2414819c0986bedfa80646bf3d86 100644 (file)
--- a/STEER/AliDetector.h
+++ b/STEER/AliDetector.h
@@ -22,7 +22,7 @@ public:
   virtual ~AliDetector();
 
   // Inline functions
-          void  Copy(AliDetector &det) const;
+  void  Copy(AliDetector &det) const;
   virtual int   GetNdigits() const {return fNdigits;}
   virtual int   GetNhits()   const {return fNhits;}
   TClonesArray *Digits() const {return fDigits;}