modifications to be compliant with -Weffc++ option (L. Gaudichet)
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jun 2006 15:44:31 +0000 (15:44 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jun 2006 15:44:31 +0000 (15:44 +0000)
ITS/AliITSv11.cxx
ITS/AliITSv11GeomCable.cxx
ITS/AliITSv11GeomCable.h
ITS/AliITSv11GeomCableFlat.cxx
ITS/AliITSv11GeomCableRound.cxx
ITS/AliITSv11Geometry.h
ITS/AliITSv11GeometrySDD.cxx

index e574229..acd886f 100644 (file)
@@ -61,15 +61,21 @@ ClassImp(AliITSv11)
  
 
 
-AliITSv11::AliITSv11() {
+//______________________________________________________________________
+AliITSv11::AliITSv11() : AliITS(),
+  fGeomDetOut(kFALSE), // Don't write .det file
+  fGeomDetIn(kTRUE),   // Read .det file
+  fByThick(kTRUE),
+  fMajorVersion(0),
+  fMinorVersion(0),
+  fSDDgeom(0)
+{
   //    Standard default constructor for the ITS version 11.
 
     fIdN          = 0;
     fIdName       = 0;
     fIdSens       = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
-    fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kTRUE; // Read .det file
     Int_t i;
     for(i=0;i<60;i++) fRead[i] = '\0';
     for(i=0;i<60;i++) fWrite[i] = '\0';
@@ -80,7 +86,14 @@ AliITSv11::AliITSv11() {
 
 //______________________________________________________________________
 AliITSv11::AliITSv11(const char *name, const char *title)
-  : AliITS("ITS", title) {
+  : AliITS("ITS", title),
+    fGeomDetOut(kFALSE), // Don't write .det file
+    fGeomDetIn(kTRUE),   // Read .det file
+    fByThick(kTRUE),
+    fMajorVersion(0),
+    fMinorVersion(0),
+    fSDDgeom(0)
+{
   //    Standard constructor for the ITS version 11.
 
   fSDDgeom = new AliITSv11GeometrySDD(0);
@@ -98,10 +111,10 @@ AliITSv11::AliITSv11(const char *name, const char *title)
   fIdSens    = new Int_t[fIdN];
   for(i=0;i<fIdN;i++) fIdSens[i] = 0;
   fEuclidOut    = kFALSE; // Don't write Euclide file
-  fGeomDetOut   = kFALSE; // Don't write .det file
-  fGeomDetIn    = kTRUE; // Read .det file
-  SetDensityServicesByThickness();
+  //SetDensityServicesByThickness();
+  // not needed, fByThick set to kTRUE in in the member initialization lis
   
+
   fEuclidGeometry="$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.euc";
   strncpy(fEuclidGeomDet,"$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det",60);
   strncpy(fRead,fEuclidGeomDet,60);
@@ -113,7 +126,14 @@ AliITSv11::AliITSv11(const char *name, const char *title)
 //______________________________________________________________________
 AliITSv11::AliITSv11(Int_t debugITS,Int_t debugSPD,Int_t debugSDD,
                   Int_t debugSSD,Int_t debugSUP) :
-  AliITS("ITS","ITS geometry v11") {
+  AliITS("ITS","ITS geometry v11"),
+    fGeomDetOut(kFALSE), // Don't write .det file
+    fGeomDetIn(kTRUE),   // Read .det file
+    fByThick(kTRUE),
+    fMajorVersion(0),
+    fMinorVersion(0),
+    fSDDgeom(0)
+ {
   // Standard default constructor for the ITS version 11.
 
 
@@ -134,9 +154,7 @@ AliITSv11::AliITSv11(Int_t debugITS,Int_t debugSPD,Int_t debugSDD,
   fIdSens    = new Int_t[fIdN];
   for(i=0;i<fIdN;i++) fIdSens[i] = 0;
   fEuclidOut    = kFALSE; // Don't write Euclide file
-  fGeomDetOut   = kFALSE; // Don't write .det file
-  fGeomDetIn    = kTRUE; // Read .det file
-  SetDensityServicesByThickness();
+  //SetDensityServicesByThickness();
   
   fEuclidGeometry="$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.euc";
   strncpy(fEuclidGeomDet,"$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det",60);
@@ -150,7 +168,14 @@ AliITSv11::AliITSv11(Int_t debugITS,Int_t debugSPD,Int_t debugSDD,
 
 //______________________________________________________________________
 AliITSv11::AliITSv11(const AliITSv11 &source) :
- AliITS(source){
+  AliITS(source),
+  fGeomDetOut(kFALSE), // Don't write .det file
+  fGeomDetIn(kTRUE),   // Read .det file
+  fByThick(kTRUE),
+  fMajorVersion(0),
+  fMinorVersion(0),
+  fSDDgeom(0)
+{
     //     Copy Constructor for ITS version 11. This function is not to be
     // used. If any other instance of this function, other than "this" is
     // passed, an error message is returned.
index fbbded1..7f8fee0 100644 (file)
 
 ClassImp(AliITSv11GeomCable)
 
+
 //________________________________________________________________________
-AliITSv11GeomCable::AliITSv11GeomCable(const char* name) { 
+AliITSv11GeomCable::AliITSv11GeomCable(): TNamed(),
+  fDebug(0),
+  fPointArray(),
+  fVolumeArray(),
+  fCurrentVol(0),
+  fInitialNode(0)
+{ 
+  // constructor
+  fPointArray.SetOwner();
+};
+
+//________________________________________________________________________
+AliITSv11GeomCable::AliITSv11GeomCable(const char* name): TNamed(name,""),
+  fDebug(0),
+  fPointArray(),
+  fVolumeArray(),
+  fCurrentVol(0),
+  fInitialNode(0) { 
   // constructor
-  fDebug = 0;
-  fInitialNode = 0;
   fPointArray.SetOwner(); 
-  SetName(name);
 }
 
 
 //________________________________________________________________________
 AliITSv11GeomCable::AliITSv11GeomCable(const AliITSv11GeomCable &s) :
   TNamed(s.GetName(),s.GetTitle()),fDebug(s.fDebug),fPointArray(s.fPointArray),
-  fVolumeArray(s.fVolumeArray),fInitialNode(s.fInitialNode)
+  fVolumeArray(s.fVolumeArray),fCurrentVol(s.fCurrentVol),fInitialNode(s.fInitialNode)
 {
   //     Copy Constructor 
   printf("Copy Constructor of AliITSv11GeomCable ???\n");  
index 7caafb0..a805b3b 100644 (file)
@@ -21,8 +21,7 @@ class TGeoNode;
 class AliITSv11GeomCable : public TNamed {
 
  public:
-  AliITSv11GeomCable()
-    { fInitialNode = 0; fPointArray.SetOwner(); fDebug=0; };
+  AliITSv11GeomCable();
   AliITSv11GeomCable(const char* name);
   AliITSv11GeomCable(const AliITSv11GeomCable &source);
   AliITSv11GeomCable& operator=(const AliITSv11GeomCable &source);
index 28206ab..4294b4a 100644 (file)
 ClassImp(AliITSv11GeomCableFlat)
 
 //________________________________________________________________________
-AliITSv11GeomCableFlat::AliITSv11GeomCableFlat() : AliITSv11GeomCable()
+AliITSv11GeomCableFlat::AliITSv11GeomCableFlat():
+  AliITSv11GeomCable(),
+  fWidth(0),
+  fThick(0),
+  fNlayer(0)
 {
   // constructor
-  fWidth = 0;
-  fThick = 0;
-  fNlayer = 0;
   for (Int_t i=0; i<fgkCableMaxLayer ; i++) {
     fLayThickness[i] = 0;
     fTranslation[i]  = 0;
@@ -57,11 +58,12 @@ AliITSv11GeomCableFlat::AliITSv11GeomCableFlat() : AliITSv11GeomCable()
 //________________________________________________________________________
 AliITSv11GeomCableFlat::
 AliITSv11GeomCableFlat(const char* name, Double_t width, Double_t thick) :
-AliITSv11GeomCable(name) {
+  AliITSv11GeomCable(name),
+  fWidth(width),
+  fThick(thick),
+  fNlayer(0)
+ {
   // standard constructor
-  fWidth = width;
-  fThick = thick;
-  fNlayer = 0;
   for (Int_t i=0; i<fgkCableMaxLayer ; i++) {
     fLayThickness[i] = 0;
     fTranslation[i]  = 0;
index f396c95..40ca25f 100644 (file)
@@ -161,17 +161,18 @@ ClassImp(AliITSv11GeomCableRound)
 //________________________________________________________________________
 AliITSv11GeomCableRound::
 AliITSv11GeomCableRound(const char* name, Double_t radius) :
-AliITSv11GeomCable(name) {
+  AliITSv11GeomCable(name),
+  fRadius(radius),
+  fNlayer(0),
+  fPhiMin(0),
+  fPhiMax(360)
+ {
   // Constructor
-  fRadius = radius;
-  fNlayer = 0;
   for (Int_t i=0; i<fgkCableMaxLayer ; i++) {
     fLayThickness[i] = 0;
     fLayColor[i] = 0;
     fLayMedia[i] = 0;
   };
-  fPhiMin = 0;
-  fPhiMax = 360;
 }
 
 //________________________________________________________________________
index 94a2a6f..6efaf37 100644 (file)
@@ -20,8 +20,8 @@ class TGeoBBox;
 
 class AliITSv11Geometry : public TObject {
   public:
-    AliITSv11Geometry(){fDebug=kTRUE;};
-    AliITSv11Geometry(Bool_t debug){fDebug=debug;};
+    AliITSv11Geometry():fDebug(kTRUE) {};
+    AliITSv11Geometry(Bool_t debug):fDebug(debug) {};
     virtual ~AliITSv11Geometry(){};
     //
     // Sets the debug flag for debugging output
index 4eae5a7..f9fde8f 100755 (executable)
@@ -221,55 +221,139 @@ const Double_t AliITSv11GeometrySDD::fgkLongHVcableSeparation = 600*fgkmicron;
 ClassImp(AliITSv11GeometrySDD)
 
 //________________________________________________________________________
- AliITSv11GeometrySDD::AliITSv11GeometrySDD(): 
-   AliITSv11Geometry(), fMotherVol(0), fAddHybrids(kTRUE), fAddSensors(kTRUE),
-   fAddHVcables(kTRUE), fAddCables(kTRUE), fAddCoolingSyst(kTRUE),
-   fCoolingOn(kTRUE),
-   fAddOnlyLadder3min(-1), fAddOnlyLadder3max(-1),
-   fAddOnlyLadder4min(-1), fAddOnlyLadder4max(-1)
+AliITSv11GeometrySDD::AliITSv11GeometrySDD(): 
+  AliITSv11Geometry(),
+  fPinSupport(0),
+  fCoolPipeSupportL(0),
+  fCoolPipeSupportR(0),
+  fSDDsensor(0),
+  fBaseThermalBridge(0),
+  fHybrid(0),
+  fDigitCableLay3A(0),
+  fDigitCableLay3B(0),
+  fDigitCableLay4A(0),
+  fDigitCableLay4B(0),
+  fMotherVol(0),
+  fAddHybrids(kTRUE), 
+  fAddSensors(kTRUE),
+  fAddHVcables(kTRUE),
+  fAddCables(kTRUE), 
+  fAddCoolingSyst(kTRUE),
+  fCoolingOn(kTRUE),
+  fAddOnlyLadder3min(-1),
+  fAddOnlyLadder3max(-1),
+  fAddOnlyLadder4min(-1),
+  fAddOnlyLadder4max(-1),
+  fColorCarbonFiber(2),
+  fColorRyton(2),
+  fColorPhynox(2),
+  fColorSilicon(2),
+  fColorAl(2),
+  fColorPolyhamide(2),
+  fColorGlass(2),
+  fColorSMD(2),
+  fColorSMDweld(2),
+  fLay3LadderUnderSegDH(0),
+  fLay4LadderUnderSegDH(0),
+  fLay3LaddShortRadius(0),
+  fLay3LaddLongRadius(0),
+  fLay4LaddShortRadius(0),
+  fLay4LaddLongRadius(0)
 {
   //
   // Standard constructor
   //
-  fDigitCableLay3A = 0;
-  fDigitCableLay3B = 0;
-  fDigitCableLay4A = 0;
-  fDigitCableLay4B = 0;
   SetParameters();
 }
 
 //________________________________________________________________________
 AliITSv11GeometrySDD::AliITSv11GeometrySDD(Int_t debug) :
-  AliITSv11Geometry(debug),fMotherVol(0),fAddHybrids(kTRUE),fAddSensors(kTRUE),
-  fAddHVcables(kTRUE), fAddCables(kTRUE), fAddCoolingSyst(kTRUE),
+  AliITSv11Geometry(debug),
+  fPinSupport(0),
+  fCoolPipeSupportL(0),
+  fCoolPipeSupportR(0),
+  fSDDsensor(0),
+  fBaseThermalBridge(0),
+  fHybrid(0),
+  fDigitCableLay3A(0),
+  fDigitCableLay3B(0),
+  fDigitCableLay4A(0),
+  fDigitCableLay4B(0),
+  fMotherVol(0),
+  fAddHybrids(kTRUE), 
+  fAddSensors(kTRUE),
+  fAddHVcables(kTRUE),
+  fAddCables(kTRUE), 
+  fAddCoolingSyst(kTRUE),
   fCoolingOn(kTRUE),
-  fAddOnlyLadder3min(-1), fAddOnlyLadder3max(-1),
-  fAddOnlyLadder4min(-1), fAddOnlyLadder4max(-1)
+  fAddOnlyLadder3min(-1),
+  fAddOnlyLadder3max(-1),
+  fAddOnlyLadder4min(-1),
+  fAddOnlyLadder4max(-1),
+  fColorCarbonFiber(2),
+  fColorRyton(2),
+  fColorPhynox(2),
+  fColorSilicon(2),
+  fColorAl(2),
+  fColorPolyhamide(2),
+  fColorGlass(2),
+  fColorSMD(2),
+  fColorSMDweld(2),
+  fLay3LadderUnderSegDH(0),
+  fLay4LadderUnderSegDH(0),
+  fLay3LaddShortRadius(0),
+  fLay3LaddLongRadius(0),
+  fLay4LaddShortRadius(0),
+  fLay4LaddLongRadius(0)
 {
   //
   // Constructor setting debugging level
   //
-  fDigitCableLay3A = 0;
-  fDigitCableLay3B = 0;
-  fDigitCableLay4A = 0;
-  fDigitCableLay4B = 0;
   SetParameters();
 }
 
 //________________________________________________________________________
 AliITSv11GeometrySDD::AliITSv11GeometrySDD(const AliITSv11GeometrySDD &s) :
- AliITSv11Geometry(s.GetDebug()),fMotherVol(s.fMotherVol),
- fAddHybrids(s.fAddHybrids),fAddSensors(s.fAddSensors),
- fAddHVcables(s.fAddHVcables), fAddCables(s.fAddCables),
- fAddCoolingSyst(s.fAddCoolingSyst),fCoolingOn(s.fCoolingOn),
- fAddOnlyLadder3min(s.fAddOnlyLadder3min),fAddOnlyLadder3max(s.fAddOnlyLadder3max),
- fAddOnlyLadder4min(s.fAddOnlyLadder4min), fAddOnlyLadder4max(s.fAddOnlyLadder4max)
+ AliITSv11Geometry(s.GetDebug()),
+  fPinSupport(s.fPinSupport),
+  fCoolPipeSupportL(s.fCoolPipeSupportL),
+  fCoolPipeSupportR(s.fCoolPipeSupportR),
+  fSDDsensor(s.fSDDsensor),
+  fBaseThermalBridge(s.fBaseThermalBridge),
+  fHybrid(s.fHybrid),
+  fDigitCableLay3A(s.fDigitCableLay3A),
+  fDigitCableLay3B(s.fDigitCableLay3B),
+  fDigitCableLay4A(s.fDigitCableLay4A),
+  fDigitCableLay4B(s.fDigitCableLay4B),
+  fMotherVol(s.fMotherVol),
+  fAddHybrids(s.fAddHybrids), 
+  fAddSensors(s.fAddSensors),
+  fAddHVcables(s.fAddHVcables),
+  fAddCables(s.fAddCables), 
+  fAddCoolingSyst(s.fAddCoolingSyst),
+  fCoolingOn(s.fCoolingOn),
+  fAddOnlyLadder3min(s.fAddOnlyLadder3min),
+  fAddOnlyLadder3max(s.fAddOnlyLadder3max),
+  fAddOnlyLadder4min(s.fAddOnlyLadder4min),
+ fAddOnlyLadder4max(s.fAddOnlyLadder4max),
+  fColorCarbonFiber(s.fColorCarbonFiber),
+  fColorRyton(s.fColorRyton),
+  fColorPhynox(s.fColorPhynox),
+  fColorSilicon(s.fColorSilicon),
+  fColorAl(s.fColorAl),
+  fColorPolyhamide(s.fColorPolyhamide),
+  fColorGlass(s.fColorGlass),
+  fColorSMD(s.fColorSMD),
+  fColorSMDweld(s.fColorSMDweld),
+  fLay3LadderUnderSegDH(s.fLay3LadderUnderSegDH),
+  fLay4LadderUnderSegDH(s.fLay4LadderUnderSegDH),
+  fLay3LaddShortRadius(s.fLay3LaddShortRadius),
+  fLay3LaddLongRadius(s.fLay3LaddLongRadius),
+  fLay4LaddShortRadius(s.fLay4LaddShortRadius),
+  fLay4LaddLongRadius(s.fLay4LaddLongRadius)
 {
-  //     Copy Constructor 
-  fDigitCableLay3A = 0;
-  fDigitCableLay3B = 0;
-  fDigitCableLay4A = 0;
-  fDigitCableLay4B = 0;
+  //     Copy Constructor
+  // do only a "shallow copy" ...
   SetParameters();
 }