]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Coverity
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 26 Nov 2011 23:46:17 +0000 (23:46 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 26 Nov 2011 23:46:17 +0000 (23:46 +0000)
ITS/AliITSv11GeomCable.cxx
ITS/AliITSv11GeomCable.h
ITS/AliITSv11GeometrySSD.cxx
ITS/AliITSv11GeometrySSD.h

index dfa22c9e37c8fcd731a3b6dd0fe0f4a3cfac02dd..4a780558a6350da49fb32e6f052e04aa28b3f4bd 100644 (file)
@@ -50,6 +50,7 @@ AliITSv11GeomCable::AliITSv11GeomCable(): TNamed(),
 { 
   // constructor
   fPointArray.SetOwner();
+  for(Int_t i=0;i<fgkCableMaxNodeLevel;i++)fNodeInd[i]=0;
 }
 
 //________________________________________________________________________
@@ -61,34 +62,10 @@ AliITSv11GeomCable::AliITSv11GeomCable(const char* name): TNamed(name,""),
   fInitialNode(0) { 
   // constructor
   fPointArray.SetOwner(); 
+  for(Int_t i=0;i<fgkCableMaxNodeLevel;i++)fNodeInd[i]=0;
 }
 
 
-//________________________________________________________________________
-AliITSv11GeomCable::AliITSv11GeomCable(const AliITSv11GeomCable &s) :
-  TNamed(s.GetName(),s.GetTitle()),fDebug(s.fDebug),fPointArray(s.fPointArray),
-  fVolumeArray(s.fVolumeArray),fCurrentVol(s.fCurrentVol),fInitialNode(s.fInitialNode)
-{
-  //     Copy Constructor 
-  printf("Copy Constructor of AliITSv11GeomCable ???\n");  
-}
-
-//________________________________________________________________________
-AliITSv11GeomCable& AliITSv11GeomCable::operator=(const AliITSv11GeomCable &s) {
-  //     Assignment operator
-  // Not fully inplemented yet !!!
-  printf("Assignment operator of AliITSv11GeomCable not fully inplemented yet !!!\n");  
-
-  if(&s == this) return *this;
-  SetName(s.GetName());
-  SetTitle(s.GetTitle());
-  fDebug = s.fDebug;
-//   fPointArray = s.fPointArray;
-//   fVolumeArray = s.fVolumeArray;
-  fInitialNode = s.fInitialNode;
-  return *this;
-}
-
 //________________________________________________________________________
 AliITSv11GeomCable::~AliITSv11GeomCable() {
   fPointArray.Clear();
index 8d00fdc479586ade978424983ff5464503ecc702..5915fcad680ae016833a8066209e086c6192ff21 100644 (file)
@@ -23,8 +23,6 @@ class AliITSv11GeomCable : public TNamed {
  public:
   AliITSv11GeomCable();
   AliITSv11GeomCable(const char* name);
-  AliITSv11GeomCable(const AliITSv11GeomCable &source);
-  AliITSv11GeomCable& operator=(const AliITSv11GeomCable &source);
 
   virtual ~AliITSv11GeomCable();
   void SetDebug(Int_t debug = 1) {fDebug = debug;};
@@ -48,6 +46,8 @@ class AliITSv11GeomCable : public TNamed {
   void ResetPoints();
 
  protected:
+  AliITSv11GeomCable(const AliITSv11GeomCable &source);
+  AliITSv11GeomCable& operator=(const AliITSv11GeomCable &source);
   bool     CheckDaughter(const TGeoNode* node, Int_t i = 0);
   void     ResetCheckDaughter();
   void     CopyFrom(Double_t *c, const Double_t *o) const;
index 2b7bf33b028b9a3705a842db0ae3b5586edb85bf..8fcd30e70f7c0e64470b16d4250f05c16a7d3515 100644 (file)
@@ -613,7 +613,9 @@ AliITSv11GeometrySSD::AliITSv11GeometrySSD():
   ////////////////////////
   // Standard constructor
   ////////////////////////
-
+  for(Int_t i=0; i<fgkendladdermountingblocknumber; i++){
+    fendladdermountingblockcombitrans[i] = NULL;
+  }
   for (Int_t i=0; i < fgkcarbonfibersupportnumber; i++) {
     fcarbonfibersupport[i] = 0;
     fcarbonfibersupportmatrix[i] = 0;
@@ -679,93 +681,12 @@ AliITSv11GeometrySSD::AliITSv11GeometrySSD():
   for (Int_t i = 0; i < 2; i++) {
     fLay5LadderSupport[i] = 0;
     fLay6LadderSupport[i] = 0;
+    fcoolingtubematrix[i] = NULL;
+    fendladdersegment[i] = NULL;
+    fendladdersegmentmatrix[i] = NULL;
   }
 }
-/////////////////////////////////////////////////////////////////////////////////
-AliITSv11GeometrySSD::AliITSv11GeometrySSD(const AliITSv11GeometrySSD &s):
-  AliITSv11Geometry(s.GetDebug()),
-  fSSDChipMedium(s.fSSDChipMedium),
-  fSSDChipGlueMedium(s.fSSDChipGlueMedium),
-  fSSDStiffenerMedium(s.fSSDStiffenerMedium),
-  fSSDStiffenerConnectorMedium(s.fSSDStiffenerConnectorMedium),
-  fSSDStiffener0603CapacitorMedium(s.fSSDStiffener0603CapacitorMedium),
-  fSSDStiffener1812CapacitorMedium(s.fSSDStiffener1812CapacitorMedium),
-  fSSDStiffenerCapacitorCapMedium(s.fSSDStiffenerCapacitorCapMedium),
-  fSSDStiffenerHybridWireMedium(s.fSSDStiffenerHybridWireMedium),
-  fSSDKaptonFlexMedium(s.fSSDKaptonFlexMedium),
-  fSSDAlTraceFlexMedium(s.fSSDAlTraceFlexMedium),
-  fSSDAlTraceLadderCableMedium(s.fSSDAlTraceLadderCableMedium),
-  fSSDKaptonLadderCableMedium(s.fSSDKaptonLadderCableMedium),
-  fSSDKaptonChipCableMedium(s.fSSDKaptonChipCableMedium),
-  fSSDAlTraceChipCableMedium(s.fSSDAlTraceChipCableMedium),
-  fSSDAlCoolBlockMedium(s.fSSDAlCoolBlockMedium),
-  fSSDSensorMedium(s.fSSDSensorMedium),
-  fSSDSensorSupportMedium(s.fSSDSensorSupportMedium),
-  fSSDCarbonFiberMedium(s.fSSDCarbonFiberMedium),
-  fSSDTubeHolderMedium(s.fSSDTubeHolderMedium),
-  fSSDCoolingTubeWater(s.fSSDCoolingTubeWater),
-  fSSDCoolingTubePhynox(s.fSSDCoolingTubePhynox),
-  fSSDSupportRingAl(s.fSSDSupportRingAl),
-  fSSDMountingBlockMedium(s.fSSDMountingBlockMedium),
-  fSSDRohaCellCone(s.fSSDRohaCellCone),
-  fSSDAir(s.fSSDAir),
-  fSSDCopper(s.fSSDCopper),  
-  fSSDSn(s.fSSDSn),
-  fCreateMaterials(s.fCreateMaterials),
-  fTransformationMatrices(s.fTransformationMatrices),
-  fBasicObjects(s.fBasicObjects),
-  fcarbonfiberjunction(s.fcarbonfiberjunction),
-  fcoolingtubesupport(s.fcoolingtubesupport),
-  fhybridmatrix(s.fhybridmatrix),
-  fssdcoolingblocksystem(s.fssdcoolingblocksystem),
-  fcoolingblocksystematrix(s.fcoolingblocksystematrix),
-  fssdstiffenerflex(s.fssdstiffenerflex),
-  fssdendflex(s.fssdendflex),
-  fcoolingtube(s.fcoolingtube),
-  fendladdercoolingtubesupportmatrix(s.fendladdercoolingtubesupportmatrix),
-  fendladdermountingblock(s.fendladdermountingblock),
-  fendladdermountingblockclip(s.fendladdermountingblockclip),
-  fSSDSensor5(s.fSSDSensor5),
-  fSSDSensor6(s.fSSDSensor6),
-  fSSDLayer5(s.fSSDLayer5),    
-  fSSDLayer6(s.fSSDLayer6),
-  fMotherVol(s.fMotherVol),
-  fLay5LadderSupportRing(s.fLay5LadderSupportRing),
-  fLay6LadderSupportRing(s.fLay6LadderSupportRing),
-  fgkEndCapSupportSystem(s.fgkEndCapSupportSystem),
-  fSSDCone(s.fSSDCone),
-  fColorCarbonFiber(s.fColorCarbonFiber),
-  fColorRyton(s.fColorRyton),
-  fColorPhynox(s.fColorPhynox),
-  fColorSilicon(s.fColorSilicon),
-  fColorAl(s.fColorAl),
-  fColorNiSn(s.fColorNiSn),
-  fColorKapton(s.fColorKapton),
-  fColorPolyhamide(s.fColorPolyhamide),
-  fColorStiffener(s.fColorStiffener),
-  fColorEpoxy(s.fColorEpoxy),
-  fColorWater(s.fColorWater),
-  fColorG10(s.fColorG10)
-{
-  ////////////////////////
-  // Copy Constructor
-  ////////////////////////
-}
-/////////////////////////////////////////////////////////////////////////////////
-AliITSv11GeometrySSD& AliITSv11GeometrySSD::
-operator=(const AliITSv11GeometrySSD &s){
-  ////////////////////////
-  // Assignment operator
-  ////////////////////////
-  this->~AliITSv11GeometrySSD();
-  new(this) AliITSv11GeometrySSD(s); 
-  return *this;
-/*     
-  if(&s == this) return *this;
-  fMotherVol = s.fMotherVol;
-  return *this;
- */
-}
+
 ///////////////////////////////////////////////////////////////////////////////
 void AliITSv11GeometrySSD::CreateTransformationMatrices(){
   ///////////////////////////////////////////////////////////////////////  
index a4e6e755339f209593fa6dcb5aa2734afbaaa241..7d0b02b47978ef89a46e7ef13332b554ab9b7841 100644 (file)
@@ -26,8 +26,6 @@ class TGeoVolumeAssembly;
 class AliITSv11GeometrySSD: public AliITSv11Geometry {
 public:
   AliITSv11GeometrySSD();
-  AliITSv11GeometrySSD(const AliITSv11GeometrySSD &source);
-  AliITSv11GeometrySSD& operator=(const AliITSv11GeometrySSD &source);
   virtual ~AliITSv11GeometrySSD(){};
   /////////////////////////////////////////////////////////////////////////
   // Public methods
@@ -59,6 +57,9 @@ public:
   void SSDCone(TGeoVolume* moth); // Setting SSD Cone;
   void SSDCables(TGeoVolume* moth); // Setting SSD Cables;
 private:
+  AliITSv11GeometrySSD(const AliITSv11GeometrySSD &source);
+  AliITSv11GeometrySSD& operator=(const AliITSv11GeometrySSD &source);
+
   /////////////////////////////////////////////////////////////////////////////////
   // Names of the Sensitive Volumes of Layer 5 and Layer 6
   /////////////////////////////////////////////////////////////////////////////////