EffC++ warnings corrected.

diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx
index 43cd60080c68cd14cef5d3d50a7981ff8ce65615..37dad7f74e2a76cec96f86233bda38bf30a60acd 100644 (file)
--- a/STRUCT/AliALIFE.cxx
+++ b/STRUCT/AliALIFE.cxx
@@ -25,33 +25,52 @@
 
 ClassImp(AliALIFE)
 
-
-AliALIFE::AliALIFE(const char* file1, const char* file2)
+AliALIFE::AliALIFE(const char* file1, const char* file2):
+    fNBodies(0), 
+    fNVolumes(0), 
+    fBodyFile(file1),
+    fVolumeFile(file2),
+    fFile1(fopen(fBodyFile,"w")),
+    fFile2(fopen(fVolumeFile,"w")),
+    fDefaultVolume1("DEFAU1"),
+    fDefaultVolume2("DEFAU2")    
 {  
 // Constructor
-    fNBodies = 0; 
-    fNVolumes= 0; 
-    fBodyFile   = file1;   // File for Fluka bodies
-    fVolumeFile = file2;
-    fFile1=fopen(fBodyFile,"w");
-    fFile2=fopen(fVolumeFile,"w");
     BodyHeader();
     VolumeHeader();
-    fDefaultVolume1 = "DEFAU1";
-    fDefaultVolume2 = "DEFAU2";    
 }
 
-AliALIFE::AliALIFE()
+AliALIFE::AliALIFE():
+    fNBodies(0), 
+    fNVolumes(0), 
+    fBodyFile("FlukaBody.inp"),
+    fVolumeFile("FlukaVolume.inp"),
+    fFile1(fopen(fBodyFile,"w")),
+    fFile2(fopen(fVolumeFile,"w")),
+    fDefaultVolume1("DEFAU1"),
+    fDefaultVolume2("DEFAU2")    
 {
 // Default constructor
-    fBodyFile   = "FlukaBody.inp";  
-    fVolumeFile = "FlukaVolume.inp";
-    fFile1=fopen(fBodyFile,"w");
-    fFile2=fopen(fVolumeFile,"w");
     BodyHeader();
     VolumeHeader();
 }
 
+
+AliALIFE::AliALIFE(const AliALIFE &rhs): 
+    TObject(rhs),
+    fNBodies(0), 
+    fNVolumes(0), 
+    fBodyFile(0),
+    fVolumeFile(0),
+    fFile1(0),
+    fFile2(0),
+    fDefaultVolume1(0),
+    fDefaultVolume2(0)   
+{
+    // Copy Constructor
+    rhs.Copy(*this);
+}
+
 void AliALIFE::BodyHeader()
 {
 // Write header for body definitions

diff --git a/STRUCT/AliALIFE.h b/STRUCT/AliALIFE.h
index 1289cce158bd7adeb31b0d6141bbd89484e1b0db..32e9d84cb0c3eb392abc2eb9e643d36f4b372a56 100644 (file)
--- a/STRUCT/AliALIFE.h
+++ b/STRUCT/AliALIFE.h
@@ -12,9 +12,8 @@ class AliALIFE : public  TObject {
  public:
     AliALIFE(const char *name1, const char *name2);
     AliALIFE();    
-    AliALIFE(const AliALIFE &rhs) : TObject(rhs) {
-       rhs.Copy(*this);
-    }
+    AliALIFE(const AliALIFE &rhs);
+
     virtual ~AliALIFE() {}
     void Cylinder(Float_t rmin, Float_t rmax,
                  Float_t zmin, Float_t zmax,

diff --git a/STRUCT/AliFRAME.cxx b/STRUCT/AliFRAME.cxx
index 6058c97218264d8a721e3abfa19b89bbcdbc1d2c..0befd7bfa6f245bb780f4b3c0fe1818f6de15728 100644 (file)
--- a/STRUCT/AliFRAME.cxx
+++ b/STRUCT/AliFRAME.cxx
@@ -39,9 +39,11 @@
 #include "AliRun.h"
  
 ClassImp(AliFRAME)
+
  
 //_____________________________________________________________________________
-AliFRAME::AliFRAME()
+AliFRAME::AliFRAME():
+    fRefVolumeId(0)
 {
   //
   // Default constructor
@@ -50,7 +52,8 @@ AliFRAME::AliFRAME()
  
 //_____________________________________________________________________________
 AliFRAME::AliFRAME(const char *name, const char *title)
-  : AliModule(name,title)
+    : AliModule(name,title),
+      fRefVolumeId(0)
 {
   //
   // Standard constructor

diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx
index 64997fbf58044d45b130abf66a35099ba0e44a66..2fc29305af25a4bd8ae4ac8ea3d636a1b35266bc 100644 (file)
--- a/STRUCT/AliFRAMEv2.cxx
+++ b/STRUCT/AliFRAMEv2.cxx
@@ -33,23 +33,23 @@
 #include "AliLog.h"
  
 ClassImp(AliFRAMEv2)
+
  
 //_____________________________________________________________________________
-AliFRAMEv2::AliFRAMEv2()
+AliFRAMEv2::AliFRAMEv2():
+    fHoles(0)
 {
 // Constructor
-    SetHoles(0);
 }
 
 //_____________________________________________________________________________
 AliFRAMEv2::AliFRAMEv2(const char *name, const char *title)
-  : AliFRAME(name,title)
+    : AliFRAME(name,title), 
+      fHoles(0)
 {
 // Constructor
-    SetHoles(0);
 }
 
- 
 //___________________________________________
 void AliFRAMEv2::CreateGeometry()
 {

diff --git a/STRUCT/AliFieldReader.cxx b/STRUCT/AliFieldReader.cxx
index 2e1879dda597d749e5d8f8958d52d1d22122feff..53fd712c4356a0e11163f88803fa4b9691e0cdf1 100644 (file)
--- a/STRUCT/AliFieldReader.cxx
+++ b/STRUCT/AliFieldReader.cxx
@@ -31,18 +31,42 @@
 ClassImp(AliFieldReader)
 
 
+
 //_______________________________________________________________________
-AliFieldReader::AliFieldReader()
+AliFieldReader::AliFieldReader():
+    fField(0),
+    fMap(0),
+    fCatalogue(0),
+    fHtmlMain(0),
+    fStepSize(0.),
+    fZStart(1383.),
+    fDd(0.08),
+    fDz(0.064),
+    fPolarity(1.),
+    fCatalogueName("goodfiles.list")
 {
 //
 //  Constructor
 //
-    SetCatalogueName();
-    SetZStart();
-    SetPolarity();
-    
-    fDd = 0.08;
-    fDz = 0.064;
+}
+
+AliFieldReader::AliFieldReader(const AliFieldReader& reader):
+    TObject(reader),
+    fField(0),
+    fMap(0),
+    fCatalogue(0),
+    fHtmlMain(0),
+    fStepSize(0.),
+    fZStart(0.),
+    fDd(0.),
+    fDz(0.),
+    fPolarity(0.),
+    fCatalogueName(0)
+{
+//
+//  Constructor
+//
+    reader.Copy(*this);
 }
 
 //_______________________________________________________________________
@@ -817,3 +841,20 @@ void AliFieldReader::ReadRegisterMapSolenoid()
     fclose(regmap);
     
 }
+
+
+AliFieldReader& AliFieldReader::operator=(const  AliFieldReader& rhs)
+{
+// Assignment operator
+    rhs.Copy(*this);
+    return *this;
+}
+
+
+void AliFieldReader::Copy( TObject&) const
+{
+    //
+    // Copy 
+    //
+    Fatal("Copy","Not implemented!\n");
+}

diff --git a/STRUCT/AliFieldReader.h b/STRUCT/AliFieldReader.h
index 3ff95cffac0c98ee87a0b6a95b443daa775dbe73..fffbea735b35da8de62431bbae4639941d2b9b23 100644 (file)
--- a/STRUCT/AliFieldReader.h
+++ b/STRUCT/AliFieldReader.h
@@ -21,6 +21,7 @@ class AliFieldReader : public TObject
 
  public:
     AliFieldReader();
+    AliFieldReader(const AliFieldReader& reader);
     virtual ~AliFieldReader();
     virtual void Init();
     virtual void ReadMap();
@@ -37,6 +38,9 @@ class AliFieldReader : public TObject
     void MakeHtmlTrailor(FILE* file);
     void ReadRegisterMap();
     void ReadRegisterMapSolenoid();
+    AliFieldReader & operator=(const AliFieldReader & rhs);
+    virtual void Copy(TObject&) const;
+    
  protected:
     AliMagFMaps* fField;           // Pointer to calculated map
     TNtuple*     fMap;             // Pointer to measured map

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index c1a76fcae3774c0cb8d1451ba3550fcd32e52575..57a3be3afe776dfb393a6d4612de9fcb45b789dd 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -33,20 +33,21 @@
 #include "AliLog.h"
  
 ClassImp(AliPIPEv0)
+
  
 //_____________________________________________________________________________
-AliPIPEv0::AliPIPEv0()
+AliPIPEv0::AliPIPEv0():
+    fPipeMaterial(kBe)   
 {
 // Constructor
-    SetPipeMaterial();
 }
 
 //_____________________________________________________________________________
 AliPIPEv0::AliPIPEv0(const char *name, const char *title)
-  : AliPIPE(name,title)
+    : AliPIPE(name,title),
+      fPipeMaterial(kBe)   
 {
 // Constructor
-    SetPipeMaterial();
 }
 
  

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 011eafbd31f8e38d08b6b8a227de6b00e39ddae5..8c5f8e20f61544bceb47dbfe1da4830aa3441d6d 100644 (file)
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -39,16 +39,19 @@
 ClassImp(AliSHILv0)
  
 //_____________________________________________________________________________
-AliSHILv0::AliSHILv0()
+AliSHILv0::AliSHILv0():
+    fPbCone(1)
 {
   //
   // Default constructor for muon shield
   //
+    
 }
  
 //_____________________________________________________________________________
 AliSHILv0::AliSHILv0(const char *name, const char *title)
-  : AliSHIL(name,title)
+    : AliSHIL(name,title), 
+      fPbCone(1)
 {
   //
   // Standard constructor for muon shield
@@ -58,8 +61,7 @@ AliSHILv0::AliSHILv0(const char *name, const char *title)
   SetMarkerSize(0.4);
   // Pb  cone not yet compatible with muon chamber inner radii
   // Switched off by default
-  fPbCone=kTRUE;
-}
+ }
  
 //_____________________________________________________________________________
 void AliSHILv0::CreateGeometry()

diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx
index 44e091ae3ed68171ef9f4c6b6b17844bc1ddf04f..1fee5bff921fad47cf62dcb4d3f9e0ed3c02443a 100644 (file)
--- a/STRUCT/AliSHILv2.cxx
+++ b/STRUCT/AliSHILv2.cxx
@@ -37,9 +37,12 @@
 #include "AliLog.h"
 
 ClassImp(AliSHILv2)
+
  
 //_____________________________________________________________________________
-AliSHILv2::AliSHILv2()
+AliSHILv2::AliSHILv2():
+    fPbCone(kTRUE),
+    fWriteGeometry(kFALSE)
 {
   //
   // Default constructor for muon shield
@@ -48,7 +51,9 @@ AliSHILv2::AliSHILv2()
  
 //_____________________________________________________________________________
 AliSHILv2::AliSHILv2(const char *name, const char *title)
-  : AliSHIL(name,title)
+    : AliSHIL(name,title),
+      fPbCone(kTRUE),
+      fWriteGeometry(kFALSE)
 {
   //
   // Standard constructor for muon shield
@@ -58,8 +63,6 @@ AliSHILv2::AliSHILv2(const char *name, const char *title)
   SetMarkerSize(0.4);
   // Pb  cone not yet compatible with muon chamber inner radii
   // Switched off by default
-  SetWriteGeometry();
-  SetPbCone();
 }
  
 //_____________________________________________________________________________

diff --git a/STRUCT/AliSHILvF.cxx b/STRUCT/AliSHILvF.cxx
index 3445869cb1a5f7e5e45c69e62c752ff140448d83..d1d2adde86e2fbfa8281a0f05c83f2291d011684 100644 (file)
--- a/STRUCT/AliSHILvF.cxx
+++ b/STRUCT/AliSHILvF.cxx
@@ -30,9 +30,12 @@
 #include "AliLog.h"
 
 ClassImp(AliSHILvF)
+
  
 //_____________________________________________________________________________
-AliSHILvF::AliSHILvF()
+AliSHILvF::AliSHILvF():
+    fPbCone(kTRUE),
+    fWriteGeometry(kTRUE)
 {
   //
   // Default constructor for muon shield
@@ -41,7 +44,9 @@ AliSHILvF::AliSHILvF()
  
 //_____________________________________________________________________________
 AliSHILvF::AliSHILvF(const char *name, const char *title)
-  : AliSHIL(name,title)
+    : AliSHIL(name,title),
+      fPbCone(kTRUE),
+      fWriteGeometry(kTRUE)
 {
   //
   // Standard constructor for muon shield
@@ -51,8 +56,6 @@ AliSHILvF::AliSHILvF(const char *name, const char *title)
   SetMarkerSize(0.4);
   // Pb  cone not yet compatible with muon chamber inner radii
   // Switched off by default
-  SetWriteGeometry();
-  SetPbCone();
 }
  
 //_____________________________________________________________________________