X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFCalPlateC.cxx;h=73783470f0fcfc0a86667c371fec993df10493f1;hb=4fbb8e9d88bbd159af1e407e8bf3384f8ffc6fa3;hp=76de2459d336d41bb668666b11a8289445a632d8;hpb=6dc9348df8ccb183760ca0c448390a30b0e956b8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFCalPlateC.cxx b/TOF/AliTOFCalPlateC.cxx
index 76de2459d33..73783470f0f 100644
--- a/TOF/AliTOFCalPlateC.cxx
+++ b/TOF/AliTOFCalPlateC.cxx
@@ -13,9 +13,28 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*$Log$
+/*
+$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:57:56  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)
+
 author: Chiara Zampolli, zampolli@bo.infn.it
- */  
+*/  
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -23,76 +42,120 @@ author: Chiara Zampolli, zampolli@bo.infn.it
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TObject.h"
-#include "TROOT.h"
 #include "TBrowser.h"
-#include "TClass.h"
-#include "AliTOFGeometryV4.h"
-#include "AliTOFCalStrip.h"
+
+#include "AliLog.h"
+
 #include "AliTOFCalPlateC.h"
+#include "AliTOFCalStrip.h"
 #include "AliTOFChannel.h"
-#include <Riostream.h>
-#include <stdlib.h>
+#include "AliTOFGeometryV5.h"
 
 ClassImp(AliTOFCalPlateC)
 
 //________________________________________________________________
 
-AliTOFCalPlateC::AliTOFCalPlateC(){
-  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();
+AliTOFCalPlateC::AliTOFCalPlateC():
+  fNStripC(0),
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(0x0), 
+  fCh(0x0)
+{
+  //main ctor
 }
 //________________________________________________________________
 
-AliTOFCalPlateC::AliTOFCalPlateC(AliTOFChannel *ch):
+AliTOFCalPlateC::AliTOFCalPlateC(AliTOFChannel *ch) : 
+  fNStripC(0),
+  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
+}
+//________________________________________________________________
+
+AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom):
+  fNStripC(0),
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(geom), 
+  fCh(0x0)
+{
+  //ctor with geom
+  fNStripC = fGeom->NStripC();
+  fNpadZ = fGeom->NpadZ();
+  fNpadX = fGeom->NpadX();
+}
+//________________________________________________________________
 
+AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom, AliTOFChannel *ch): 
+  fNStripC(0),
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(geom), 
+  fCh(ch)
+{
+  //ctor with channel and geom
+  fNStripC = fGeom->NStripC();
+  fNpadZ = fGeom->NpadZ();
+  fNpadX = fGeom->NpadX();
 }
+
+//________________________________________________________________
+
+AliTOFCalPlateC& AliTOFCalPlateC::operator=(const AliTOFCalPlateC& pl)
+  {
+  //assignment operator
+    this->fCh = pl.fCh;
+    this->fNStripC = pl.fNStripC;
+    this->fNpadZ = pl.fNpadZ;
+    this->fNpadX = pl.fNpadX;
+    this->fGeom = pl.fGeom;
+    return *this;
+
+  }
 //________________________________________________________________
 
 AliTOFCalPlateC::~AliTOFCalPlateC()
 {
+  //dtor
   delete[] fCh;
 }
 
 //________________________________________________________________
 
 AliTOFCalPlateC::AliTOFCalPlateC(const AliTOFCalPlateC& pl):
-  TObject(pl)
-
+  TObject(pl),
+  fNStripC(0),
+  fNpadZ(0),
+  fNpadX(0),
+  fGeom(0x0), 
+  fCh(0x0)
   {
+  //copy ctor 
     fCh = pl.fCh;
-    fCh = pl.fCh;
-    fCh = pl.fCh;
-    fNSector = pl.fNSector;
-    fNPlate = pl.fNPlate;
-    fNStripA = pl.fNStripA;
-    fNStripB = pl.fNStripB;
     fNStripC = pl.fNStripC;
     fNpadZ = pl.fNpadZ;
     fNpadX = pl.fNpadX;
+    fGeom = pl.fGeom;
 
   }
 //________________________________________________________________
 
 void AliTOFCalPlateC::Browse(TBrowser *b){
+  //add cal obj to list of browsables
 
+  if(fGeom==0x0){
+    AliTOFGeometry *geom = new AliTOFGeometryV5(); 
+    AliInfo("V5 TOF Geometry is taken as the default");
+    fNStripC = geom->NStripC();
+    fNpadZ = geom->NpadZ();
+    fNpadX = geom->NpadX();
+    delete geom;
+  }
   char name[10];
   for(Int_t i=0; i<fNStripC; ++i) {
     snprintf(name,sizeof(name),"Strip %2.2d",i);