Fixed compiler warnings with regards to copy construtors and unused variabls

[u/mrichter/AliRoot.git] / ITS / AliITSv1.cxx

diff --git a/ITS/AliITSv1.cxx b/ITS/AliITSv1.cxx
index f57c8e4c8a18e83cf0ae32e9dc2e32f5b1805549..30e28c4fa88786d22831153960a9e6ae3560171b 100644 (file)
--- a/ITS/AliITSv1.cxx
+++ b/ITS/AliITSv1.cxx
@@ -13,45 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.20  2000/10/02 21:28:08  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.19  2000/07/10 16:07:19  fca
-Release version of ITS code
-
-Revision 1.14.2.2  2000/05/19 10:09:21  nilsen
-fix for bug with HP and Sun unix + fix for event display in ITS-working branch
-
-Revision 1.14.2.1  2000/03/04 23:45:19  nilsen
-Fixed up the comments/documentation.
-
-Revision 1.14  1999/11/25 06:52:56  fca
-Correct value of drca
-
-Revision 1.13.2.1  1999/11/25 06:52:21  fca
-Correct value of drca
-
-Revision 1.13  1999/10/27 11:16:26  fca
-Correction of problem in geometry
-
-Revision 1.12  1999/10/22 08:25:25  fca
-remove double definition of destructors
-
-Revision 1.11  1999/10/22 08:16:49  fca
-Correct destructors, thanks to I.Hrivnacova
-
-Revision 1.10  1999/10/06 19:56:50  fca
-Add destructor
-
-Revision 1.9  1999/10/05 08:05:09  fca
-Minor corrections for uninitialised variables.
-
-Revision 1.8  1999/09/29 09:24:20  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -68,27 +30,25 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
  
-#include <TMath.h>
-#include <TRandom.h>
-#include <TVector.h>
+#include <TCanvas.h>
+#include <TClonesArray.h>
+#include <TFile.h>    // only required for Tracking function?
 #include <TGeometry.h>
+#include <TMath.h>
 #include <TNode.h>
-#include <TTUBE.h>
-#include <TFile.h>    // only required for Tracking function?
-#include <TCanvas.h>
 #include <TObjArray.h>
-#include <TClonesArray.h>
-
+#include <TObjString.h>
+#include <TRandom.h>
+#include <TTUBE.h>
+#include <TVector.h>
+#include <TVirtualMC.h>
 
-#include "AliMC.h"
-#include "AliMagF.h"
 #include "AliConst.h"
-
 #include "AliITShit.h"
 #include "AliITSv1.h"
+#include "AliMagF.h"
 #include "AliRun.h"
 
-
 ClassImp(AliITSv1)
  
 //_____________________________________________________________________________
@@ -97,16 +57,11 @@ AliITSv1::AliITSv1() {
 //    Standard default constructor for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
 
-  fIdN = 6;
-  fIdName = new TString[fIdN];
-  fIdName[0] = "ITS1";
-  fIdName[1] = "ITS2";
-  fIdName[2] = "ITS3";
-  fIdName[3] = "ITS4";
-  fIdName[4] = "ITS5";
-  fIdName[5] = "ITS6";
-  fIdSens    = new Int_t[fIdN];
-  for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+  fIdN    = 0;
+  fIdName = 0;
+  fIdSens = 0;
+  fMajorVersion = 1;
+  fMinorVersion = -1;
 }
 //_____________________________________________________________________________
 AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
@@ -114,20 +69,33 @@ AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
 //    Standard constructor for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
 
-  fIdN = 6;
-  fIdName = new TString[fIdN];
-  fIdName[0] = "ITS1";
-  fIdName[1] = "ITS2";
-  fIdName[2] = "ITS3";
-  fIdName[3] = "ITS4";
-  fIdName[4] = "ITS5";
-  fIdName[5] = "ITS6";
-  fIdSens    = new Int_t[fIdN];
-  for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+    fIdN    = 6;
+/*
+//  TObjArray of TObjStrings
+    fIdName = new TObjArray(fIdN);
+    fIdName->AddAt(new TObjString("ITS1"),0);
+    fIdName->AddAt(new TObjString("ITS2"),1);
+    fIdName->AddAt(new TObjString("ITS3"),2);
+    fIdName->AddAt(new TObjString("ITS4"),3);
+    fIdName->AddAt(new TObjString("ITS5"),4);
+    fIdName->AddAt(new TObjString("ITS6"),5);
+*/
+//  Array of TStrings.
+    fIdName    = new TString[fIdN];
+    fIdName[0] = "ITS1";
+    fIdName[1] = "ITS2";
+    fIdName[2] = "ITS3";
+    fIdName[3] = "ITS4";
+    fIdName[4] = "ITS5";
+    fIdName[5] = "ITS6";
+    fIdSens    = new Int_t[fIdN];
+    for (Int_t i=0;i<fIdN;i++) fIdSens[i] = 0;
+    fMajorVersion = 1;
+    fMinorVersion = 1;
 
 }
 //____________________________________________________________________________
-AliITSv1::AliITSv1(const AliITSv1 &source){
+AliITSv1::AliITSv1(const AliITSv1 &source) : AliITS(source){
 ////////////////////////////////////////////////////////////////////////
 //     Copy Constructor for ITS version 1.
 ////////////////////////////////////////////////////////////////////////
@@ -261,7 +229,7 @@ void AliITSv1::CreateGeometry(){
   
   
   //     PARAMETERS FOR SMALL (1/2) ITS 
-
+/*
   for (i = 0; i < 6; ++i) {
     dzl[i] /= 2.;
     dzb[i] /= 2.;
@@ -273,8 +241,8 @@ void AliITSv1::CreateGeometry(){
   dzfc     /= 2.;
   zmax     /= 2.;
   xltpc    /= 2.;
-  acable    = 15.;
-  
+*/
+  acable    = 15.;  
   
   
   //     EQUAL DISTRIBUTION INTO THE 6 LAYERS 
@@ -892,22 +860,6 @@ void AliITSv1::StepManager(){
     hits[5]=momentum[2];
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
-    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 */
 }
-//____________________________________________________________________________
-void AliITSv1::Streamer(TBuffer &R__b){
-////////////////////////////////////////////////////////////////////////
-//    A dummy Streamer function for this class AliITSv1. By default it
-// only streams the AliITS class as it is required. Since this class
-// dosen't contain any "real" data to be saved, it doesn't.
-////////////////////////////////////////////////////////////////////////
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      AliITS::Streamer(R__b);
-   } else {
-      R__b.WriteVersion(AliITSv1::IsA());
-      AliITS::Streamer(R__b);
-   } // end if R__b.IsReading()
-}