X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFCalStrip.cxx;h=803b2ddbef9565be8beeea98605e748f44283ea1;hb=5ab6fc5d1286a858dca1ff84b5910379b6805f30;hp=44dd96a25a749cc7182944d0a9c51979ff090436;hpb=762446e011c767d2d5b8a444f32c1af8570ac630;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFCalStrip.cxx b/TOF/AliTOFCalStrip.cxx
index 44dd96a25a7..803b2ddbef9 100644
--- a/TOF/AliTOFCalStrip.cxx
+++ b/TOF/AliTOFCalStrip.cxx
@@ -15,6 +15,21 @@
 
 /*
 $Log$
+Revision 1.6  2006/04/20 22:30:49  hristov
+Coding conventions (Annalisa)
+
+Revision 1.5  2006/04/16 22:29:05  hristov
+Coding conventions (Annalisa)
+
+Revision 1.4  2006/04/05 08:35:38  hristov
+Coding conventions (S.Arcelli, C.Zampolli)
+
+Revision 1.3  2006/03/28 14:58:08  arcelli
+updates to handle new V5 geometry & some re-arrangements
+
+Revision 1.2  2006/02/13 17:22:26  arcelli
+just Fixing Log info
+
 Revision 1.1  2006/02/13 16:10:48  arcelli
 Add classes for TOF Calibration (C.Zampolli)
 
@@ -27,71 +42,106 @@ author: Chiara Zampolli, zampolli@bo.infn.it
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TObject.h"
-#include "TROOT.h"
 #include "TBrowser.h"
-#include "TClass.h"
-#include "AliTOFGeometryV4.h"
-#include "AliTOFChannel.h"
-#include "AliTOFCalStrip.h"
+
+#include "AliLog.h"
+
 #include "AliTOFCalPadZ.h"
+#include "AliTOFCalStrip.h"
+#include "AliTOFChannel.h"
+#include "AliTOFGeometryV5.h"
 
 ClassImp(AliTOFCalStrip)
 
 //________________________________________________________________
 
-AliTOFCalStrip::AliTOFCalStrip(){
-  fCh = 0;
-  fNSector = AliTOFGeometryV4::NSectors();
-  fNPlate = AliTOFGeometryV4::NPlates();
-  fNStripA = AliTOFGeometryV4::NStripA();
-  fNStripB = AliTOFGeometryV4::NStripB();
-  fNStripC = 20;
-  //  fNStripC = AliTOFGeometryV4::NStripC();
-  fNpadZ = AliTOFGeometryV4::NpadZ();
-  fNpadX = AliTOFGeometryV4::NpadX();
+AliTOFCalStrip::AliTOFCalStrip():
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(0x0), 
+  fCh(0x0)
+{
+  //main ctor
 }
 //________________________________________________________________
 
 AliTOFCalStrip::AliTOFCalStrip(AliTOFChannel *ch):
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(0x0), 
   fCh(ch)
 {
-  fNSector = AliTOFGeometryV4::NSectors();
-  fNPlate = AliTOFGeometryV4::NPlates();
-  fNStripA = AliTOFGeometryV4::NStripA();
-  fNStripB = AliTOFGeometryV4::NStripB();
-  fNStripC = 20;
-  //  fNStripC = AliTOFGeometryV4::NStripC();
-  fNpadZ = AliTOFGeometryV4::NpadZ();
-  fNpadX = AliTOFGeometryV4::NpadX();
+  // ctor with channel
+}
+//________________________________________________________________
 
+AliTOFCalStrip::AliTOFCalStrip(AliTOFGeometry *geom):
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(geom), 
+  fCh(0x0)
+{
+  //ctor with geom
+  fNpadZ = fGeom->NpadZ();
+  fNpadX = fGeom->NpadX();
+}
+//________________________________________________________________
+
+AliTOFCalStrip::AliTOFCalStrip(AliTOFGeometry *geom,AliTOFChannel *ch):
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(geom), 
+  fCh(ch)
+{
+  //ctor with channel and geom
+  fNpadZ = fGeom->NpadZ();
+  fNpadX = fGeom->NpadX();
 }
 //________________________________________________________________
 
 AliTOFCalStrip::~AliTOFCalStrip()
 {
+  //dtor
   delete[] fCh;
 }
 
 //________________________________________________________________
 
 AliTOFCalStrip::AliTOFCalStrip(const AliTOFCalStrip& strip):
-  TObject(strip)
+  TObject(strip),
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(0x0), 
+  fCh(0x0)
   {
+    //copy ctor
     fCh = strip.fCh;
-    fNSector = strip.fNSector;
-    fNPlate = strip.fNPlate;
-    fNStripA = strip.fNStripA;
-    fNStripB = strip.fNStripB;
-    fNStripC = strip.fNStripC;
     fNpadZ = strip.fNpadZ;
     fNpadX = strip.fNpadX;
 
   }
 //________________________________________________________________
 
-void AliTOFCalStrip::Browse(TBrowser *b){
+AliTOFCalStrip& AliTOFCalStrip::operator=(const AliTOFCalStrip& strip)
+  {
+    //assignment operator
+    this->fCh = strip.fCh;
+    this->fNpadZ = strip.fNpadZ;
+    this->fNpadX = strip.fNpadX;
+    return *this;
+
+  }
+//________________________________________________________________
 
+void AliTOFCalStrip::Browse(TBrowser *b){
+  //add obj to list of browsables
+  if(fGeom==0x0){
+    AliTOFGeometry *geom = new AliTOFGeometryV5();
+    AliInfo("V5 TOF Geometry is taken as the default");
+    fNpadZ = geom->NpadZ();
+    fNpadX = geom->NpadX();
+    delete geom;
+  }
   char name[10];
   for(Int_t i=0; i<fNpadZ; ++i) {
     snprintf(name,sizeof(name),"PadZ %2.2d",i);