From 655e379fccf84b600659b6651cfeb8a0bdc9892d Mon Sep 17 00:00:00 2001 From: arcelli Date: Tue, 22 Aug 2006 13:34:46 +0000 Subject: [PATCH] removal of effective c++ warnings (C.Zampolli) --- TOF/AliTOF.cxx | 59 +++++++++------- TOF/AliTOFAlignment.cxx | 17 +++-- TOF/AliTOFCal.cxx | 57 +++++++++++----- TOF/AliTOFCalPadZ.cxx | 36 +++++++--- TOF/AliTOFCalPlateA.cxx | 52 +++++++++----- TOF/AliTOFCalPlateB.cxx | 52 +++++++++----- TOF/AliTOFCalPlateC.cxx | 52 +++++++++----- TOF/AliTOFCalSector.cxx | 67 ++++++++++++------ TOF/AliTOFCalStrip.cxx | 39 +++++++---- TOF/AliTOFChSim.cxx | 7 +- TOF/AliTOFChannel.cxx | 7 +- TOF/AliTOFDDLRawData.cxx | 38 +++++++---- TOF/AliTOFDigitMap.cxx | 25 +++++-- TOF/AliTOFDigitizer.cxx | 31 +++++---- TOF/AliTOFGeometry.cxx | 26 +++---- TOF/AliTOFHitMap.cxx | 38 ++++++++--- TOF/AliTOFRawStream.cxx | 107 ++++++++++++++++++++++++++--- TOF/AliTOFSDigit.cxx | 58 +++++++++++----- TOF/AliTOFSDigitizer.cxx | 143 +++++++++++++++++++++++++++++++++------ TOF/AliTOFT0.cxx | 38 ++++++++--- TOF/AliTOFTrigger.cxx | 34 +++++++--- TOF/AliTOFcalib.cxx | 59 +++++++++++++++- TOF/AliTOFcalib.h | 4 +- TOF/AliTOFcalibESD.cxx | 4 ++ TOF/AliTOFdigit.cxx | 49 ++++++++++++-- TOF/AliTOFdigit.h | 4 +- TOF/AliTOFhit.cxx | 55 ++++++++++++++- TOF/AliTOFhit.h | 2 +- TOF/AliTOFhitT0.cxx | 60 ++++++++++++++-- TOF/AliTOFhitT0.h | 2 +- TOF/AliTOFpidESD.cxx | 17 ++++- TOF/AliTOFpidESD.h | 6 +- TOF/AliTOFtrack.cxx | 93 +++++++++++++++++++++++-- TOF/AliTOFtrack.h | 2 +- TOF/AliTOFv4T0.cxx | 20 +++++- TOF/AliTOFv5T0.cxx | 23 ++++++- 36 files changed, 1086 insertions(+), 297 deletions(-) diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index c12f911dd47..94423da89b0 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -74,27 +74,38 @@ extern AliRun *gAlice; ClassImp(AliTOF) //_____________________________________________________________________________ -AliTOF::AliTOF() +AliTOF::AliTOF(): + fFGeom(0x0), + fDTask(0x0), + fReTask(0x0), + fSDigits(0x0), + fNSDigits(0), + fReconParticles(0x0), + fIdSens(-1), + fTZero(kFALSE), + fTOFGeometry(0x0) { // // Default constructor // - fFGeom = 0x0; - fDTask = 0x0; - fReTask = 0x0; + fDigits = 0; fIshunt = 0; - fSDigits = 0 ; - fNSDigits = 0; - fDigits = 0 ; - fReconParticles = 0x0; - fName="TOF"; - fTZero = kFALSE; - fTOFGeometry = 0; + fName = "TOF"; } //_____________________________________________________________________________ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) - : AliDetector(name,title) + : + AliDetector(name,title), + fFGeom(0x0), + fDTask(0x0), + fReTask(0x0), + fSDigits(0x0), + fNSDigits(0), + fReconParticles(0x0), + fIdSens(-1), + fTZero(kFALSE), + fTOFGeometry(0x0) { // // AliTOF standard constructor @@ -104,16 +115,13 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) // Initialization of hits, sdigits and digits array // added option for time zero analysis - fFGeom = 0x0; //skowron - fDTask = 0x0; - fReTask = 0x0; - fReconParticles= 0x0; + //skowron fTOFGeometry = new AliTOFGeometry(); if (strstr(option,"tzero")){ fHits = new TClonesArray("AliTOFhitT0", 1000); fTZero = kTRUE; - //AliWarning("tzero option requires AliTOFv4T0/AliTOFv5T0 as TOF version (check Your Config.C)"); + // AliWarning("tzero option requires AliTOFv4T0/AliTOFv5T0 as TOF version (check Your Config.C)"); }else{ fHits = new TClonesArray("AliTOFhit", 1000); fTZero = kFALSE; @@ -131,12 +139,6 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) fIshunt = 0; fSDigits = new TClonesArray("AliTOFSDigit", 1000); fDigits = new TClonesArray("AliTOFdigit", 1000); - fNSDigits = 0; - - fFGeom = 0x0; - fDTask = 0x0; - fReTask = 0x0; - fReconParticles = 0x0; // // Digitization parameters @@ -177,7 +179,16 @@ void AliTOF::GetTOFSectors(Int_t *sectors) const } //_____________________________________________________________________________ AliTOF::AliTOF(const AliTOF &source) - :AliDetector() + :AliDetector(), + fFGeom(0x0), + fDTask(0x0), + fReTask(0x0), + fSDigits(0x0), + fNSDigits(0), + fReconParticles(0x0), + fIdSens(-1), + fTZero(kFALSE), + fTOFGeometry(0x0) { // copy constructor diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index a82323f3a39..74457207878 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2006/08/10 14:46:54 decaro +TOF raw data format: updated version + Revision 1.8 2006/05/04 19:41:42 hristov Possibility for partial TOF geometry (S.Arcelli) @@ -66,14 +69,20 @@ author: Silvia Arcelli, arcelli@bo.infn.it ClassImp(AliTOFAlignment) //_____________________________________________________________________________ -AliTOFAlignment::AliTOFAlignment():TTask("AliTOFAlignment","") { +AliTOFAlignment::AliTOFAlignment(): + TTask("AliTOFAlignment",""), + fNTOFAlignObj(0), + fTOFAlignObjArray(0x0) + { //AliTOFalignment main Ctor - fNTOFAlignObj=0; - fTOFAlignObjArray=0x0; } //_____________________________________________________________________________ -AliTOFAlignment::AliTOFAlignment(const AliTOFAlignment &t):TTask("AliTOFAlignment",""){ +AliTOFAlignment::AliTOFAlignment(const AliTOFAlignment &t): + TTask("AliTOFAlignment",""), + fNTOFAlignObj(0), + fTOFAlignObjArray(0x0) +{ //AliTOFAlignment copy Ctor fNTOFAlignObj=t.fNTOFAlignObj; diff --git a/TOF/AliTOFCal.cxx b/TOF/AliTOFCal.cxx index d69835d7756..8397e6e3f09 100644 --- a/TOF/AliTOFCal.cxx +++ b/TOF/AliTOFCal.cxx @@ -15,6 +15,9 @@ /* $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) @@ -54,25 +57,38 @@ ClassImp(AliTOFCal) //________________________________________________________________ -AliTOFCal::AliTOFCal():TObject(){ +AliTOFCal::AliTOFCal(): + TObject(), + fNSector(0), + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fnpad(0), + fGeom(0x0), + fPads(0x0) +{ //main ctor - fGeom = 0x0; - fNSector = 0; - fNPlate = 0; - fNStripA = 0; - fNStripB = 0; - fNStripC = 0; - fNpadZ = 0; - fNpadX = 0; - fnpad = 0; - fPads = 0x0; gROOT->GetListOfBrowsables()->Add(this); } //________________________________________________________________ -AliTOFCal::AliTOFCal(AliTOFGeometry *geom):TObject(){ +AliTOFCal::AliTOFCal(AliTOFGeometry *geom): + TObject(), + fNSector(0), + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fnpad(0), + fGeom(geom), + fPads(0x0) +{ //ctor with geom - fGeom = geom; fNSector = fGeom->NSectors(); fNPlate = fGeom->NPlates(); fNStripA = fGeom->NStripA(); @@ -81,14 +97,23 @@ AliTOFCal::AliTOFCal(AliTOFGeometry *geom):TObject(){ fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); fnpad = fNSector*(2*(fNStripC+fNStripB)+fNStripA)*fNpadZ*fNpadX; - fPads = 0x0; gROOT->GetListOfBrowsables()->Add(this); } //________________________________________________________________ AliTOFCal::AliTOFCal(const AliTOFCal& cal): - TObject(cal) - { + TObject(cal), + fNSector(0), + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fnpad(0), + fGeom(0x0), + fPads(0x0) +{ //copy ctor fNSector = cal.fNSector; fNPlate = cal.fNPlate; diff --git a/TOF/AliTOFCalPadZ.cxx b/TOF/AliTOFCalPadZ.cxx index f66c83532ee..a6557bfc233 100644 --- a/TOF/AliTOFCalPadZ.cxx +++ b/TOF/AliTOFCalPadZ.cxx @@ -15,6 +15,9 @@ /* $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) @@ -51,28 +54,40 @@ ClassImp(AliTOFCalPadZ) //________________________________________________________________ -AliTOFCalPadZ::AliTOFCalPadZ(){ - fCh = 0; - fNpadX=0; + AliTOFCalPadZ::AliTOFCalPadZ(): + fNpadX(0), + fGeom(0x0), + fCh(0) +{ + //fCh = 0; + //fNpadX=0; } //________________________________________________________________ AliTOFCalPadZ::AliTOFCalPadZ(AliTOFChannel *ch): + fNpadX(0), + fGeom(0x0), fCh(ch) { - fNpadX = 0; + //fNpadX = 0; } //________________________________________________________________ -AliTOFCalPadZ::AliTOFCalPadZ(AliTOFGeometry *geom){ +AliTOFCalPadZ::AliTOFCalPadZ(AliTOFGeometry *geom): + fNpadX(0), + fGeom(geom), + fCh(0) +{ //ctor with TOF geometry - fCh = 0; - fGeom = geom; + //fCh = 0; + //fGeom = geom; fNpadX = fGeom->NpadX(); } //________________________________________________________________ AliTOFCalPadZ::AliTOFCalPadZ(AliTOFGeometry *geom,AliTOFChannel *ch): + fNpadX(0), + fGeom(geom), fCh(ch) { //ctor with TOF geometry and cal channel @@ -81,8 +96,11 @@ AliTOFCalPadZ::AliTOFCalPadZ(AliTOFGeometry *geom,AliTOFChannel *ch): } //________________________________________________________________ -AliTOFCalPadZ::AliTOFCalPadZ(const AliTOFCalPadZ &source) - :TObject() +AliTOFCalPadZ::AliTOFCalPadZ(const AliTOFCalPadZ &source): + TObject(), + fNpadX(0), + fGeom(0x0), + fCh(0) { // copy constructor diff --git a/TOF/AliTOFCalPlateA.cxx b/TOF/AliTOFCalPlateA.cxx index 9ce120f72d8..cf1d339c34b 100644 --- a/TOF/AliTOFCalPlateA.cxx +++ b/TOF/AliTOFCalPlateA.cxx @@ -15,6 +15,9 @@ /* $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) @@ -52,40 +55,50 @@ ClassImp(AliTOFCalPlateA) //________________________________________________________________ -AliTOFCalPlateA::AliTOFCalPlateA(){ +AliTOFCalPlateA::AliTOFCalPlateA(): + fNStripA(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) +{ //main ctor - fCh = 0; - fGeom= 0x0; - fNStripA = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateA::AliTOFCalPlateA(AliTOFChannel *ch) : fCh(ch) +AliTOFCalPlateA::AliTOFCalPlateA(AliTOFChannel *ch) : + fNStripA(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(ch) { //ctor with channel - fGeom= 0x0; - fNStripA = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateA::AliTOFCalPlateA(AliTOFGeometry *geom){ +AliTOFCalPlateA::AliTOFCalPlateA(AliTOFGeometry *geom): + fNStripA(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(0x0) +{ //ctor with geom - fCh = 0; - fGeom = geom; fNStripA = fGeom->NStripA(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); } //________________________________________________________________ -AliTOFCalPlateA::AliTOFCalPlateA(AliTOFGeometry *geom, AliTOFChannel *ch): fCh(ch) +AliTOFCalPlateA::AliTOFCalPlateA(AliTOFGeometry *geom, AliTOFChannel *ch): + fNStripA(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(ch) { //ctor with geom and channel - fGeom = geom; fNStripA = fGeom->NStripA(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); @@ -101,7 +114,12 @@ AliTOFCalPlateA::~AliTOFCalPlateA() //________________________________________________________________ AliTOFCalPlateA::AliTOFCalPlateA(const AliTOFCalPlateA& pl): - TObject(pl) + TObject(pl), + fNStripA(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) { //copy ctor fCh = pl.fCh; diff --git a/TOF/AliTOFCalPlateB.cxx b/TOF/AliTOFCalPlateB.cxx index e094b92f530..39513fe2ac5 100644 --- a/TOF/AliTOFCalPlateB.cxx +++ b/TOF/AliTOFCalPlateB.cxx @@ -15,6 +15,9 @@ /* $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) @@ -52,40 +55,50 @@ ClassImp(AliTOFCalPlateB) //________________________________________________________________ -AliTOFCalPlateB::AliTOFCalPlateB(){ +AliTOFCalPlateB::AliTOFCalPlateB(): + fNStripB(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) +{ //main ctor - fCh = 0; - fGeom= 0x0; - fNStripB = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateB::AliTOFCalPlateB(AliTOFChannel *ch) : fCh(ch) +AliTOFCalPlateB::AliTOFCalPlateB(AliTOFChannel *ch) : + fNStripB(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(ch) { //ctor with channel - fGeom= 0x0; - fNStripB = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateB::AliTOFCalPlateB(AliTOFGeometry *geom){ +AliTOFCalPlateB::AliTOFCalPlateB(AliTOFGeometry *geom): + fNStripB(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(0x0) +{ //ctor with geom - fCh = 0; - fGeom = geom; fNStripB = fGeom->NStripB(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); } //________________________________________________________________ -AliTOFCalPlateB::AliTOFCalPlateB(AliTOFGeometry *geom, AliTOFChannel *ch): fCh(ch) +AliTOFCalPlateB::AliTOFCalPlateB(AliTOFGeometry *geom, AliTOFChannel *ch): + fNStripB(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(ch) { //ctor with channel and geom - fGeom = geom; fNStripB = fGeom->NStripB(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); @@ -102,7 +115,12 @@ AliTOFCalPlateB::~AliTOFCalPlateB() //________________________________________________________________ AliTOFCalPlateB::AliTOFCalPlateB(const AliTOFCalPlateB& pl): - TObject(pl) + TObject(pl), + fNStripB(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) { //copy ctor fCh = pl.fCh; diff --git a/TOF/AliTOFCalPlateC.cxx b/TOF/AliTOFCalPlateC.cxx index b2a19eb317f..73783470f0f 100644 --- a/TOF/AliTOFCalPlateC.cxx +++ b/TOF/AliTOFCalPlateC.cxx @@ -15,6 +15,9 @@ /* $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) @@ -52,40 +55,50 @@ ClassImp(AliTOFCalPlateC) //________________________________________________________________ -AliTOFCalPlateC::AliTOFCalPlateC(){ +AliTOFCalPlateC::AliTOFCalPlateC(): + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) +{ //main ctor - fCh = 0; - fGeom= 0x0; - fNStripC = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateC::AliTOFCalPlateC(AliTOFChannel *ch) : fCh(ch) +AliTOFCalPlateC::AliTOFCalPlateC(AliTOFChannel *ch) : + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(ch) { //ctor with channel - fGeom= 0x0; - fNStripC = 0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom){ +AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom): + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(0x0) +{ //ctor with geom - fCh = 0; - fGeom = geom; fNStripC = fGeom->NStripC(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); } //________________________________________________________________ -AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom, AliTOFChannel *ch): fCh(ch) +AliTOFCalPlateC::AliTOFCalPlateC(AliTOFGeometry *geom, AliTOFChannel *ch): + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(ch) { //ctor with channel and geom - fGeom = geom; fNStripC = fGeom->NStripC(); fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); @@ -115,7 +128,12 @@ AliTOFCalPlateC::~AliTOFCalPlateC() //________________________________________________________________ AliTOFCalPlateC::AliTOFCalPlateC(const AliTOFCalPlateC& pl): - TObject(pl) + TObject(pl), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) { //copy ctor fCh = pl.fCh; diff --git a/TOF/AliTOFCalSector.cxx b/TOF/AliTOFCalSector.cxx index e9d522abd55..95b73cc4cc0 100644 --- a/TOF/AliTOFCalSector.cxx +++ b/TOF/AliTOFCalSector.cxx @@ -15,6 +15,9 @@ /* $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) @@ -57,40 +60,48 @@ ClassImp(AliTOFCalSector) //________________________________________________________________ -AliTOFCalSector::AliTOFCalSector(){ +AliTOFCalSector::AliTOFCalSector(): + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) +{ //main ctor - fCh = 0; - fGeom=0x0; - fNPlate=0; - fNStripA=0; - fNStripB=0; - fNStripC=0; - fNpadZ=0; - fNpadX=0; gROOT->GetListOfBrowsables()->Add(this); } //________________________________________________________________ AliTOFCalSector::AliTOFCalSector(AliTOFChannel *ch): + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), fCh(ch) { //ctor with channel - fGeom=0x0; - fNPlate=0; - fNStripA=0; - fNStripB=0; - fNStripC=0; - fNpadZ=0; - fNpadX=0; gROOT->GetListOfBrowsables()->Add(this); } //________________________________________________________________ -AliTOFCalSector::AliTOFCalSector(AliTOFGeometry *geom){ +AliTOFCalSector::AliTOFCalSector(AliTOFGeometry *geom): + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(0x0) +{ //ctor with geom - fCh = 0; - fGeom= geom; fNPlate = fGeom->NPlates(); fNStripA = fGeom->NStripA(); fNStripB = fGeom->NStripB(); @@ -103,10 +114,16 @@ AliTOFCalSector::AliTOFCalSector(AliTOFGeometry *geom){ //________________________________________________________________ AliTOFCalSector::AliTOFCalSector(AliTOFGeometry *geom,AliTOFChannel *ch): + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(geom), fCh(ch) { // ctor with channel and geom - fGeom= geom; fNPlate = fGeom->NPlates(); fNStripA = fGeom->NStripA(); fNStripB = fGeom->NStripB(); @@ -118,7 +135,15 @@ AliTOFCalSector::AliTOFCalSector(AliTOFGeometry *geom,AliTOFChannel *ch): //________________________________________________________________ AliTOFCalSector::AliTOFCalSector(const AliTOFCalSector& sec): - TObject(sec) + TObject(sec), + fNPlate(0), + fNStripA(0), + fNStripB(0), + fNStripC(0), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) { //copy ctor fCh = sec.fCh; diff --git a/TOF/AliTOFCalStrip.cxx b/TOF/AliTOFCalStrip.cxx index 053162ed08f..803b2ddbef9 100644 --- a/TOF/AliTOFCalStrip.cxx +++ b/TOF/AliTOFCalStrip.cxx @@ -15,6 +15,9 @@ /* $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) @@ -52,39 +55,45 @@ ClassImp(AliTOFCalStrip) //________________________________________________________________ -AliTOFCalStrip::AliTOFCalStrip(){ +AliTOFCalStrip::AliTOFCalStrip(): + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) +{ //main ctor - fCh = 0; - fGeom= 0x0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ AliTOFCalStrip::AliTOFCalStrip(AliTOFChannel *ch): + fNpadZ(0), + fNpadX(0), + fGeom(0x0), fCh(ch) { // ctor with channel - fGeom= 0x0; - fNpadZ = 0; - fNpadX = 0; } //________________________________________________________________ -AliTOFCalStrip::AliTOFCalStrip(AliTOFGeometry *geom){ +AliTOFCalStrip::AliTOFCalStrip(AliTOFGeometry *geom): + fNpadZ(0), + fNpadX(0), + fGeom(geom), + fCh(0x0) +{ //ctor with geom - fCh = 0; - fGeom = 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 - fGeom = geom; fNpadZ = fGeom->NpadZ(); fNpadX = fGeom->NpadX(); } @@ -99,7 +108,11 @@ AliTOFCalStrip::~AliTOFCalStrip() //________________________________________________________________ AliTOFCalStrip::AliTOFCalStrip(const AliTOFCalStrip& strip): - TObject(strip) + TObject(strip), + fNpadZ(0), + fNpadX(0), + fGeom(0x0), + fCh(0x0) { //copy ctor fCh = strip.fCh; diff --git a/TOF/AliTOFChSim.cxx b/TOF/AliTOFChSim.cxx index 2c2ad5156d8..33074456a1c 100644 --- a/TOF/AliTOFChSim.cxx +++ b/TOF/AliTOFChSim.cxx @@ -15,6 +15,9 @@ /* $Log$ +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) @@ -38,7 +41,9 @@ fSpectrum(-1) {} //________________________________________________________________ AliTOFChSim::AliTOFChSim(const AliTOFChSim& channel) : - TObject(channel) + TObject(channel), + fSlewedStatus(kFALSE), + fSpectrum(-1) { // copy constructor fSlewedStatus = channel.fSlewedStatus; diff --git a/TOF/AliTOFChannel.cxx b/TOF/AliTOFChannel.cxx index 41ce38951f4..399b507c2b7 100644 --- a/TOF/AliTOFChannel.cxx +++ b/TOF/AliTOFChannel.cxx @@ -15,6 +15,9 @@ /* $Log$ +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) @@ -49,7 +52,9 @@ fDelay(delay) //________________________________________________________________ AliTOFChannel::AliTOFChannel(const AliTOFChannel& channel) : - TObject(channel) + TObject(channel), + fStatus(kFALSE), + fDelay(0) { // copy constructor diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx index 9883c972e5f..d96c94dbefd 100644 --- a/TOF/AliTOFDDLRawData.cxx +++ b/TOF/AliTOFDDLRawData.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.11 2006/08/10 14:46:54 decaro +TOF raw data format: updated version + Revision 1.10.1 2006/06/28 A.De Caro Update TOF raw data format according to the final version @@ -65,31 +68,40 @@ extern TRandom *gRandom; ClassImp(AliTOFDDLRawData) //--------------------------------------------------------------------------- -AliTOFDDLRawData::AliTOFDDLRawData() +AliTOFDDLRawData::AliTOFDDLRawData(): + fVerbose(0), + fIndex(-1), + fTOFgeometry(0), + fTOFdigitMap(new AliTOFDigitMap()), + fTOFdigitArray(0x0), + fTOFrawStream(new AliTOFRawStream()) { //Default constructor - fIndex=-1; - fVerbose=0; - fTOFgeometry = 0; - fTOFdigitMap = new AliTOFDigitMap(); } //---------------------------------------------------------------------------- -AliTOFDDLRawData::AliTOFDDLRawData(AliTOFGeometry *tofGeom) +AliTOFDDLRawData::AliTOFDDLRawData(AliTOFGeometry *tofGeom): + fVerbose(0), + fIndex(-1), + fTOFgeometry(tofGeom), + fTOFdigitMap(new AliTOFDigitMap()), + fTOFdigitArray(0x0), + fTOFrawStream(new AliTOFRawStream()) { //Constructor - fIndex=-1; - fVerbose=0; - fTOFgeometry = tofGeom; - fTOFdigitMap = new AliTOFDigitMap(); - fTOFdigitArray = 0x0; - fTOFrawStream = new AliTOFRawStream(); } //---------------------------------------------------------------------------- AliTOFDDLRawData::AliTOFDDLRawData(const AliTOFDDLRawData &source) : - TObject(source) { + TObject(source), + fVerbose(0), + fIndex(-1), + fTOFgeometry(0), + fTOFdigitMap(new AliTOFDigitMap()), + fTOFdigitArray(0x0), + fTOFrawStream(new AliTOFRawStream()) + { //Copy Constructor this->fIndex=source.fIndex; this->fVerbose=source.fVerbose; diff --git a/TOF/AliTOFDigitMap.cxx b/TOF/AliTOFDigitMap.cxx index cc5f2f1027b..7f8690dc741 100644 --- a/TOF/AliTOFDigitMap.cxx +++ b/TOF/AliTOFDigitMap.cxx @@ -42,14 +42,19 @@ ClassImp(AliTOFDigitMap) -AliTOFDigitMap::AliTOFDigitMap() +AliTOFDigitMap::AliTOFDigitMap(): + fNSector(-1), + fNplate(-1), + fNstrip(-1), + fNpx(-1), + fNpz(-1), + fMaxIndex(-1), + fDigitMap(0x0), + fTOFGeometry(new AliTOFGeometry()) { // // Default ctor // - fDigitMap = 0; - - fTOFGeometry = new AliTOFGeometry(); fNSector = AliTOFGeometry::NSectors(); fNplate = AliTOFGeometry::NPlates(); @@ -64,8 +69,16 @@ AliTOFDigitMap::AliTOFDigitMap() } //////////////////////////////////////////////////////////////////////// -AliTOFDigitMap::AliTOFDigitMap(const AliTOFDigitMap & /*digitMap*/) -:TObject() +AliTOFDigitMap::AliTOFDigitMap(const AliTOFDigitMap & /*digitMap*/): + TObject(), + fNSector(-1), + fNplate(-1), + fNstrip(-1), + fNpx(-1), + fNpz(-1), + fMaxIndex(-1), + fDigitMap(0x0), + fTOFGeometry(new AliTOFGeometry()) { // // Dummy copy constructor diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 2ad3022c96c..b1fbd951b10 100644 --- a/TOF/AliTOFDigitizer.cxx +++ b/TOF/AliTOFDigitizer.cxx @@ -57,29 +57,34 @@ extern AliRun *gAlice; ClassImp(AliTOFDigitizer) //___________________________________________ - AliTOFDigitizer::AliTOFDigitizer() :AliDigitizer() + AliTOFDigitizer::AliTOFDigitizer() : + AliDigitizer(), + fGeom(0x0), + fDigits(0x0), + fSDigitsArray(0x0), + fhitMap(0x0) { // Default ctor - don't use it - fDigits=0; - fSDigitsArray=0; - fhitMap=0; - fGeom=0x0; } //___________________________________________ -AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager) - :AliDigitizer(manager) +AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager): + AliDigitizer(manager), + fGeom(0x0), + fDigits(0x0), + fSDigitsArray(0x0), + fhitMap(0x0) { //ctor with RunDigitizer - fDigits=0; - fSDigitsArray=0; - fhitMap=0; - fGeom=0x0; } //------------------------------------------------------------------------ -AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source) - :AliDigitizer(source) +AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source): + AliDigitizer(source), + fDigits(0), + fSDigitsArray(0), + fhitMap(0), + fGeom(0x0) { // copy constructor this->fDigits=source.fDigits; diff --git a/TOF/AliTOFGeometry.cxx b/TOF/AliTOFGeometry.cxx index 9b485138732..c2819860473 100644 --- a/TOF/AliTOFGeometry.cxx +++ b/TOF/AliTOFGeometry.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2006/04/20 22:30:50 hristov +Coding conventions (Annalisa) + Revision 1.15 2006/04/16 22:29:05 hristov Coding conventions (Annalisa) @@ -103,22 +106,21 @@ const Float_t AliTOFGeometry::fgkSigmaForTail2= 0.5;//Sig2 for simulation of TDC const Float_t AliTOFGeometry::fgkTdcBin = 24.4; // time-window for the TDC bins [ps] //_____________________________________________________________________________ -AliTOFGeometry::AliTOFGeometry() +AliTOFGeometry::AliTOFGeometry(): + fNStripC(19), // number of strips in C type module + fZlenA(106.0), // length (cm) of the A module + fZlenB(141.0), // length (cm) of the B module + fZlenC(177.5), // length (cm) of the C module + fMaxhZtof(371.5), // Max half z-size of TOF (cm) + fRmin(370.), // Inner radius of the TOF (cm) + fRmax(399.), // Outer radius of the TOF (cm) + fxTOF(371.), // Inner radius of the TOF for Reconstruction (cm) + fHoles(0), // Flag for Holes + fPhiSec(20.) // sector Phi width (deg) { // // AliTOFGeometry default constructor // - - fNStripC = 19; // number of strips in C type module - fZlenA = 106.0; // length (cm) of the A module - fZlenB = 141.0; // length (cm) of the B module - fZlenC = 177.5; // length (cm) of the C module - fMaxhZtof = 371.5; // Max half z-size of TOF (cm) - - fxTOF = 371.; // Inner radius of the TOF for Reconstruction (cm) - fRmin = 370.; // Inner radius of the TOF (cm) - fRmax = 399.; // Outer radius of the TOF (cm) - Init(); } diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx index f84e04a0ef1..f8b759d4cd3 100644 --- a/TOF/AliTOFHitMap.cxx +++ b/TOF/AliTOFHitMap.cxx @@ -42,17 +42,33 @@ ClassImp(AliTOFHitMap) -AliTOFHitMap::AliTOFHitMap() +AliTOFHitMap::AliTOFHitMap(): + fNSector(-1), + fNplate(-1), + fNstrip(-1), + fNpx(-1), + fNpz(-1), + fSDigits(0x0), + fMaxIndex(-1), + fHitMap(0x0), + fTOFGeometry(0x0) { // // Default ctor // - fHitMap = 0; - fSDigits = 0; } //////////////////////////////////////////////////////////////////////// -AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom) +AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom): + fNSector(-1), + fNplate(-1), + fNstrip(-1), + fNpx(-1), + fNpz(-1), + fSDigits(dig), + fMaxIndex(-1), + fHitMap(0x0), + fTOFGeometry(tofGeom) { // // ctor @@ -61,8 +77,6 @@ AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom) // of course, these constants must not be hardwired // change later - fTOFGeometry = tofGeom; - fNSector = AliTOFGeometry::NSectors(); fNplate = AliTOFGeometry::NPlates(); fNstrip = fTOFGeometry->NStripC();//fTOFGeometry->NMaxNstrip(); @@ -70,13 +84,21 @@ AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom) fNpz = AliTOFGeometry::NpadZ(); fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz; fHitMap = new Int_t[fMaxIndex]; - fSDigits = dig; Clear(); } //////////////////////////////////////////////////////////////////////// AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & /*hitMap*/) -:TObject() + :TObject(), + fNSector(-1), + fNplate(-1), + fNstrip(-1), + fNpx(-1), + fNpz(-1), + fSDigits(0x0), + fMaxIndex(-1), + fHitMap(0x0), + fTOFGeometry(0x0) { // // Dummy copy constructor diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index a85f4190f98..b85bfba35df 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2006/08/10 14:46:54 decaro +TOF raw data format: updated version + Revision 1.6.1 2006/06/28 A. De Caro, R. Preghenella: Update TOF raw data format according to the final version @@ -355,13 +358,42 @@ ClassImp(AliTOFRawStream) //_____________________________________________________________________________ -AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader) +AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader): + fRawReader(0x0), + fDDL(-1), + fTRM(-1), + fTDC(-1), + fTRMchain(-1), + fTDCchannel(-1), + fTof(-1), + fToT(-1), + fErrorFlag(-1), + + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadX(-1), + fPadZ(-1), + fTOFGeometry(new AliTOFGeometryV5()), + fWordType(-1), + fSlotID(-1), + fACQ(-1), + fPSbit(-1), + fTime(-1), + fTDCerrorFlag(-1), + fInsideDRM(kFALSE), + fInsideTRM(kFALSE), + fInsideLTM(kFALSE), + fInsideTRMchain0(kFALSE), + fInsideTRMchain1(kFALSE), + fLeadingOrphane(kFALSE) { // // create an object to read TOF raw digits // fRawReader = rawReader; + /* fDDL = -1; fTRM = -1; fTDC = -1; @@ -376,11 +408,10 @@ AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader) fStrip = -1; fPadX = -1; fPadZ = -1; - fTOFGeometry = new AliTOFGeometryV5(); - + */ fRawReader->Select("TOF"); - + /* fWordType = -1; fSlotID = -1; fACQ = -1; @@ -393,16 +424,44 @@ AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader) fInsideTRMchain0 = kFALSE; fInsideTRMchain1 = kFALSE; fLeadingOrphane = kFALSE; - + */ } //_____________________________________________________________________________ -AliTOFRawStream::AliTOFRawStream() +AliTOFRawStream::AliTOFRawStream(): + fRawReader(0x0), + fDDL(-1), + fTRM(-1), + fTDC(-1), + fTRMchain(-1), + fTDCchannel(-1), + fTof(-1), + fToT(-1), + fErrorFlag(-1), + + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadX(-1), + fPadZ(-1), + fTOFGeometry(new AliTOFGeometryV5()), + fWordType(-1), + fSlotID(-1), + fACQ(-1), + fPSbit(-1), + fTime(-1), + fTDCerrorFlag(-1), + fInsideDRM(kFALSE), + fInsideTRM(kFALSE), + fInsideLTM(kFALSE), + fInsideTRMchain0(kFALSE), + fInsideTRMchain1(kFALSE), + fLeadingOrphane(kFALSE) { // // default ctr // - + /* fRawReader = 0x0; fDDL = -1; fTRM = -1; @@ -418,9 +477,7 @@ AliTOFRawStream::AliTOFRawStream() fStrip = -1; fPadX = -1; fPadZ = -1; - fTOFGeometry = new AliTOFGeometryV5(); - fWordType = -1; fSlotID = -1; fACQ = -1; @@ -433,12 +490,40 @@ AliTOFRawStream::AliTOFRawStream() fInsideTRMchain0 = kFALSE; fInsideTRMchain1 = kFALSE; fLeadingOrphane = kFALSE; - + */ } //_____________________________________________________________________________ AliTOFRawStream::AliTOFRawStream(const AliTOFRawStream& stream) : - TObject(stream) + TObject(stream), + fRawReader(0x0), + fDDL(-1), + fTRM(-1), + fTDC(-1), + fTRMchain(-1), + fTDCchannel(-1), + fTof(-1), + fToT(-1), + fErrorFlag(-1), + + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadX(-1), + fPadZ(-1), + fTOFGeometry(new AliTOFGeometryV5()), + fWordType(-1), + fSlotID(-1), + fACQ(-1), + fPSbit(-1), + fTime(-1), + fTDCerrorFlag(-1), + fInsideDRM(kFALSE), + fInsideTRM(kFALSE), + fInsideLTM(kFALSE), + fInsideTRMchain0(kFALSE), + fInsideTRMchain1(kFALSE), + fLeadingOrphane(kFALSE) { // // copy constructor diff --git a/TOF/AliTOFSDigit.cxx b/TOF/AliTOFSDigit.cxx index dba17762599..5ed787dffee 100644 --- a/TOF/AliTOFSDigit.cxx +++ b/TOF/AliTOFSDigit.cxx @@ -42,20 +42,34 @@ ClassImp(AliTOFSDigit) //////////////////////////////////////////////////////////////////////// - AliTOFSDigit::AliTOFSDigit() +AliTOFSDigit::AliTOFSDigit(): + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fNDigits(0), + fTdc(0x0), + fAdc(0x0), + fTracks(0x0) { // // default ctor // - fNDigits = 0; - fTdc = 0; - fAdc = 0; - fTracks = 0; } //////////////////////////////////////////////////////////////////////// -AliTOFSDigit::AliTOFSDigit(Int_t tracknum, Int_t *vol,Float_t *digit) -:TObject() +AliTOFSDigit::AliTOFSDigit(Int_t tracknum, Int_t *vol,Float_t *digit): + TObject(), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fNDigits(0), + fTdc(0x0), + fAdc(0x0), + fTracks(0x0) { // // Constructor of digit object @@ -79,8 +93,17 @@ AliTOFSDigit::AliTOFSDigit(Int_t tracknum, Int_t *vol,Float_t *digit) } //////////////////////////////////////////////////////////////////////// -AliTOFSDigit::AliTOFSDigit(const AliTOFSDigit & digit) -:TObject() +AliTOFSDigit::AliTOFSDigit(const AliTOFSDigit & digit): + TObject(), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fNDigits(0), + fTdc(0x0), + fAdc(0x0), + fTracks(0x0) { // // copy ctor for AliTOFSDigit object @@ -117,17 +140,20 @@ AliTOFSDigit& AliTOFSDigit::operator=(const AliTOFSDigit & digit) //////////////////////////////////////////////////////////////////////// AliTOFSDigit::AliTOFSDigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, - Int_t padz, Float_t tdc, Float_t adc) + Int_t padz, Float_t tdc, Float_t adc): + fSector(sector), + fPlate(plate), + fStrip(strip), + fPadx(padx), + fPadz(padz), + fNDigits(1), + fTdc(0x0), + fAdc(0x0), + fTracks(0x0) { // // Constructor for sdigit // - fSector = sector; - fPlate = plate; - fStrip = strip; - fPadx = padx; - fPadz = padz; - fNDigits = 1; fTdc = new TArrayF(fNDigits); (*fTdc)[0] = tdc; fAdc = new TArrayF(fNDigits); diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx index 6ab959ddada..d7a8a987d4f 100644 --- a/TOF/AliTOFSDigitizer.cxx +++ b/TOF/AliTOFSDigitizer.cxx @@ -58,26 +58,93 @@ extern AliRun *gAlice; ClassImp(AliTOFSDigitizer) //____________________________________________________________________________ - AliTOFSDigitizer::AliTOFSDigitizer():TTask("TOFSDigitizer","") +AliTOFSDigitizer::AliTOFSDigitizer(): + TTask("TOFSDigitizer",""), + fEvent1(-1), + fEvent2(-1), + ftail(0x0), + fHeadersFile(""), + fRunLoader(0x0), + fTOFLoader(0x0), + fTOFGeometry(new AliTOFGeometry()), + fSelectedSector(-1), + fSelectedPlate(-1), + fTimeResolution(0), + fpadefficiency(0), + fEdgeEffect(-1), + fEdgeTails(-1), + fHparameter(0), + fH2parameter(0), + fKparameter(0), + fK2parameter(0), + fEffCenter(0), + fEffBoundary(0), + fEff2Boundary(0), + fEff3Boundary(0), + fAddTRes(0), + fResCenter(0), + fResBoundary(0), + fResSlope(0), + fTimeWalkCenter(0), + fTimeWalkBoundary(0), + fTimeWalkSlope(0), + fTimeDelayFlag(-1), + fPulseHeightSlope(0), + fTimeDelaySlope(0), + fMinimumCharge(0), + fChargeSmearing(0), + fLogChargeSmearing(0), + fTimeSmearing(0), + fAverageTimeFlag(-1), + fAdcBin(0), + fAdcMean(0), + fAdcRms(0) { // ctor - - fRunLoader = 0; - fTOFLoader = 0; - - fEvent1 = 0; - fEvent2 = 0; - ftail = 0; - fSelectedSector = -1; - fSelectedPlate = -1; - - fTOFGeometry = new AliTOFGeometry(); - } //------------------------------------------------------------------------ -AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source) - :TTask(source) +AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source): + TTask(source), + fEvent1(-1), + fEvent2(-1), + ftail(0x0), + fHeadersFile(""), + fRunLoader(0x0), + fTOFLoader(0x0), + fTOFGeometry(0x0), + fSelectedSector(-1), + fSelectedPlate(-1), + fTimeResolution(0), + fpadefficiency(0), + fEdgeEffect(-1), + fEdgeTails(-1), + fHparameter(0), + fH2parameter(0), + fKparameter(0), + fK2parameter(0), + fEffCenter(0), + fEffBoundary(0), + fEff2Boundary(0), + fEff3Boundary(0), + fAddTRes(0), + fResCenter(0), + fResBoundary(0), + fResSlope(0), + fTimeWalkCenter(0), + fTimeWalkBoundary(0), + fTimeWalkSlope(0), + fTimeDelayFlag(-1), + fPulseHeightSlope(0), + fTimeDelaySlope(0), + fMinimumCharge(0), + fChargeSmearing(0), + fLogChargeSmearing(0), + fTimeSmearing(0), + fAverageTimeFlag(-1), + fAdcBin(0), + fAdcMean(0), + fAdcRms(0) { // copy constructor this->fTOFGeometry=source.fTOFGeometry; @@ -94,14 +161,50 @@ AliTOFSDigitizer& AliTOFSDigitizer::operator=(const AliTOFSDigitizer &source) } //____________________________________________________________________________ -AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents):TTask("TOFSDigitizer","") +AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents): + TTask("TOFSDigitizer",""), + fEvent1(-1), + fEvent2(-1), + ftail(0x0), + fHeadersFile(HeaderFile), // input filename (with hits) + fRunLoader(0x0), + fTOFLoader(0x0), + fTOFGeometry(0x0), + fSelectedSector(-1), // by default we sdigitize all sectors + fSelectedPlate(-1), // by default we sdigitize all plates in all sectors + fTimeResolution(0), + fpadefficiency(0), + fEdgeEffect(-1), + fEdgeTails(-1), + fHparameter(0), + fH2parameter(0), + fKparameter(0), + fK2parameter(0), + fEffCenter(0), + fEffBoundary(0), + fEff2Boundary(0), + fEff3Boundary(0), + fAddTRes(0), + fResCenter(0), + fResBoundary(0), + fResSlope(0), + fTimeWalkCenter(0), + fTimeWalkBoundary(0), + fTimeWalkSlope(0), + fTimeDelayFlag(-1), + fPulseHeightSlope(0), + fTimeDelaySlope(0), + fMinimumCharge(0), + fChargeSmearing(0), + fLogChargeSmearing(0), + fTimeSmearing(0), + fAverageTimeFlag(-1), + fAdcBin(0), + fAdcMean(0), + fAdcRms(0) { //ctor, reading from input file - ftail = 0; - fSelectedSector=-1; // by default we sdigitize all sectors - fSelectedPlate =-1; // by default we sdigitize all plates in all sectors - fHeadersFile = HeaderFile ; // input filename (with hits) TFile * file = (TFile*) gROOT->GetFile(fHeadersFile.Data()); //File was not opened yet open file and get alirun object diff --git a/TOF/AliTOFT0.cxx b/TOF/AliTOFT0.cxx index 71211574f6e..c3dead29946 100644 --- a/TOF/AliTOFT0.cxx +++ b/TOF/AliTOFT0.cxx @@ -108,25 +108,38 @@ extern AliRun *gAlice; ClassImp(AliTOFT0) //____________________________________________________________________________ - AliTOFT0::AliTOFT0():TTask("AliTOFT0","") +AliTOFT0::AliTOFT0(): + TTask("AliTOFT0",""), + fNevents(0), + fTimeResolution(0), + fLowerMomBound(0), + fUpperMomBound(0), + fT0File(""), + fHeadersFile("") { // ctor - fNevents = 0 ; } //____________________________________________________________________________ - AliTOFT0::AliTOFT0(char* headerFile, Int_t nEvents):TTask("AliTOFT0","") +AliTOFT0::AliTOFT0(char* headerFile, Int_t nEvents): + TTask("AliTOFT0",""), + fNevents(nEvents), + fTimeResolution(1.2e-10), + fLowerMomBound(1.5), + fUpperMomBound(2.), + fT0File(""), + fHeadersFile(headerFile) { // // // - fNevents=nEvents ; // Number of events for which calculate the T0, + //fNevents=nEvents ; // Number of events for which calculate the T0, // default 0: it means all evens in current file - fLowerMomBound=1.5; // [GeV/c] default value - fUpperMomBound=2. ; // [GeV/c] default value - fTimeResolution = 1.2e-10; // 120 ps by default - fHeadersFile = headerFile ; + //fLowerMomBound=1.5; // [GeV/c] default value + //fUpperMomBound=2. ; // [GeV/c] default value + //fTimeResolution = 1.2e-10; // 120 ps by default + //fHeadersFile = headerFile ; TFile * file = (TFile*) gROOT->GetFile(fHeadersFile.Data() ) ; @@ -145,7 +158,14 @@ ClassImp(AliTOFT0) } //____________________________________________________________________________ - AliTOFT0::AliTOFT0(const AliTOFT0 & tzero):TTask("AliTOFT0","") +AliTOFT0::AliTOFT0(const AliTOFT0 & tzero): + TTask("AliTOFT0",""), + fNevents(0), + fTimeResolution(0), + fLowerMomBound(0), + fUpperMomBound(0), + fT0File(""), + fHeadersFile("") { // copy ctr diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx index 3be35e6fcbb..51ab164b964 100644 --- a/TOF/AliTOFTrigger.cxx +++ b/TOF/AliTOFTrigger.cxx @@ -69,18 +69,20 @@ ClassImp(AliTOFTrigger) CreateInputs(); } //---------------------------------------------------------------------- -AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh, Int_t UPTh, Float_t deltaminpsi, Float_t deltamaxpsi, Float_t deltaminro, Float_t deltamaxro, Int_t stripWindow) : AliTriggerDetector() +AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh, Int_t UPTh, Float_t deltaminpsi, Float_t deltamaxpsi, Float_t deltaminro, Float_t deltamaxro, Int_t stripWindow) : + AliTriggerDetector(), + fHighMultTh(HighMultTh), + fppMBTh(ppMBTh), + fMultiMuonTh(MultiMuonTh), + fUPTh(UPTh), + fdeltaminpsi(deltaminpsi), + fdeltamaxpsi(deltamaxpsi), + fdeltaminro(deltaminro), + fdeltamaxro(deltamaxro), + fstripWindow(stripWindow) + { //ctor with thresholds for triggers - fHighMultTh=HighMultTh; - fppMBTh=ppMBTh; - fMultiMuonTh=MultiMuonTh; - fUPTh=UPTh; - fdeltaminpsi = deltaminpsi; - fdeltamaxpsi = deltamaxpsi; - fdeltaminro = deltaminro; - fdeltamaxro = deltamaxro; - fstripWindow = stripWindow; for (Int_t i=0;ifSize= source.fSize; this->fArray= source.fArray; }; diff --git a/TOF/AliTOFcalibESD.cxx b/TOF/AliTOFcalibESD.cxx index 208f28a1835..98b3776f452 100644 --- a/TOF/AliTOFcalibESD.cxx +++ b/TOF/AliTOFcalibESD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/20 22:30:50 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -44,6 +47,7 @@ ClassImp(AliTOFcalibESD) //________________________________________________________________ AliTOFcalibESD::AliTOFcalibESD(): + fCombID(-1), fTOFCalCh(-1), fToT(0), fIntLen(0), diff --git a/TOF/AliTOFdigit.cxx b/TOF/AliTOFdigit.cxx index 9ef62d9c151..e1d42d1644c 100644 --- a/TOF/AliTOFdigit.cxx +++ b/TOF/AliTOFdigit.cxx @@ -39,9 +39,32 @@ ClassImp(AliTOFdigit) +//______________________________________________________________________________ +AliTOFdigit::AliTOFdigit() + :AliDigit(), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fTdc(0), + fTdcND(0), + fAdc(0), + fToT(0) +{ +} //______________________________________________________________________________ AliTOFdigit::AliTOFdigit(Int_t *tracks, Int_t *vol,Float_t *digit) -:AliDigit(tracks) + :AliDigit(tracks), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fTdc(0), + fTdcND(0), + fAdc(0), + fToT(0) { // // Constructor of digit object @@ -61,7 +84,16 @@ AliTOFdigit::AliTOFdigit(Int_t *tracks, Int_t *vol,Float_t *digit) //____________________________________________________________________________ AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit) -:AliDigit(digit) + :AliDigit(digit), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fTdc(0), + fTdcND(0), + fAdc(0), + fToT(0) { // // copy ctor for AliTOFdigit object @@ -84,7 +116,16 @@ AliTOFdigit::AliTOFdigit(const AliTOFdigit & digit) //______________________________________________________________________________ AliTOFdigit::AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, -Int_t padz, Float_t tdc, Float_t adc) + Int_t padz, Float_t tdc, Float_t adc): + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fTdc(0), + fTdcND(0), + fAdc(0), + fToT(0) { // // Constructor for sdigit @@ -188,7 +229,7 @@ Bool_t AliTOFdigit::operator==(AliTOFdigit const &digit) const } //______________________________________________________________________________ -AliTOFdigit& AliTOFdigit::operator+(AliTOFdigit const &digit) +AliTOFdigit AliTOFdigit::operator+(const AliTOFdigit &digit) { // // Overloading of Sum operator diff --git a/TOF/AliTOFdigit.h b/TOF/AliTOFdigit.h index bde47e66ef2..09675056ec2 100644 --- a/TOF/AliTOFdigit.h +++ b/TOF/AliTOFdigit.h @@ -24,7 +24,7 @@ class AliTOFdigit : public AliDigit { friend ostream& operator << ( ostream& , const AliTOFdigit&) ; public: - AliTOFdigit(){} + AliTOFdigit(); AliTOFdigit(Int_t* tracks, Int_t* vol, Float_t* digit); // new ctor for sdigits AliTOFdigit(Int_t sector, Int_t plate, Int_t strip, Int_t padx, Int_t padz, Float_t tdc, Float_t adc); @@ -54,7 +54,7 @@ friend ostream& operator << ( ostream& , const AliTOFdigit&) ; //overloading of ==, + operators (summable digits) Bool_t operator==(const AliTOFdigit& digit) const; - AliTOFdigit& operator+(AliTOFdigit const &digit) ; + AliTOFdigit operator+(const AliTOFdigit &digit) ; protected: diff --git a/TOF/AliTOFhit.cxx b/TOF/AliTOFhit.cxx index 1bd51e861de..d34682ba562 100644 --- a/TOF/AliTOFhit.cxx +++ b/TOF/AliTOFhit.cxx @@ -57,9 +57,45 @@ ClassImp(AliTOFhit) +//____________________________________________________________________________ + AliTOFhit::AliTOFhit(): + AliHit(), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0) +{ +} + //____________________________________________________________________________ AliTOFhit::AliTOFhit(const AliTOFhit & hit) -: AliHit(hit) + : AliHit(hit), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0) { // // copy ctor for AliTOFhit object @@ -89,7 +125,22 @@ AliTOFhit::AliTOFhit(const AliTOFhit & hit) //______________________________________________________________________________ AliTOFhit::AliTOFhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits) -:AliHit(shunt, track) + :AliHit(shunt, track), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0) { // // Constructor of hit object diff --git a/TOF/AliTOFhit.h b/TOF/AliTOFhit.h index 09e666b642b..5f9f10ae08a 100644 --- a/TOF/AliTOFhit.h +++ b/TOF/AliTOFhit.h @@ -20,7 +20,7 @@ class AliTOFhit : public AliHit { public: - AliTOFhit() {} + AliTOFhit(); AliTOFhit(Int_t shunt, Int_t track, Int_t* vol, Float_t *hits); AliTOFhit(const AliTOFhit & hit) ; diff --git a/TOF/AliTOFhitT0.cxx b/TOF/AliTOFhitT0.cxx index 7a829a5137a..3ce5c1145a6 100644 --- a/TOF/AliTOFhitT0.cxx +++ b/TOF/AliTOFhitT0.cxx @@ -54,9 +54,45 @@ ClassImp(AliTOFhitT0) //____________________________________________________________________________ -AliTOFhitT0::AliTOFhitT0(const AliTOFhitT0 & hit) -:AliHit(hit) + AliTOFhitT0::AliTOFhitT0(): + AliHit(), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fLenTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0) { +} +//____________________________________________________________________________ +AliTOFhitT0::AliTOFhitT0(const AliTOFhitT0 & hit): + AliHit(hit), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fLenTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0){ // // copy ctor for AliTOFhitT0 object // @@ -85,8 +121,24 @@ AliTOFhitT0::AliTOFhitT0(const AliTOFhitT0 & hit) //______________________________________________________________________________ AliTOFhitT0::AliTOFhitT0(Int_t shunt, Int_t track, Int_t *vol, - Float_t *hits) -:AliHit(shunt, track) + Float_t *hits): + AliHit(shunt, track), + fSector(-1), + fPlate(-1), + fStrip(-1), + fPadx(-1), + fPadz(-1), + fPx(0), + fPy(0), + fPz(0), + fPmom(0), + fTof(0), + fLenTof(0), + fDx(0), + fDy(0), + fDz(0), + fIncA(0), + fEdep(0) { // // Constructor of hit object diff --git a/TOF/AliTOFhitT0.h b/TOF/AliTOFhitT0.h index b38322aab62..6740549290d 100644 --- a/TOF/AliTOFhitT0.h +++ b/TOF/AliTOFhitT0.h @@ -18,7 +18,7 @@ class AliTOFhitT0 : public AliHit { public: - AliTOFhitT0() {} + AliTOFhitT0(); AliTOFhitT0(Int_t shunt, Int_t track, Int_t* vol, Float_t *hits); AliTOFhitT0(const AliTOFhitT0 & hit) ; diff --git a/TOF/AliTOFpidESD.cxx b/TOF/AliTOFpidESD.cxx index aeb99de6331..4883d9deb80 100644 --- a/TOF/AliTOFpidESD.cxx +++ b/TOF/AliTOFpidESD.cxx @@ -30,12 +30,23 @@ ClassImp(AliTOFpidESD) //_________________________________________________________________________ -AliTOFpidESD::AliTOFpidESD(Double_t *param) { + AliTOFpidESD::AliTOFpidESD(): + fN(-1), + fEventN(-1), + fSigma(0), + fRange(0) +{ +} +//_________________________________________________________________________ +AliTOFpidESD::AliTOFpidESD(Double_t *param): + fN(0), + fEventN(0), + fSigma(0), + fRange(0) + { // // The main constructor // - fN=0; fEventN=0; - fSigma=param[0]; fRange=param[1]; diff --git a/TOF/AliTOFpidESD.h b/TOF/AliTOFpidESD.h index 3b39965fce2..87bde8868e3 100644 --- a/TOF/AliTOFpidESD.h +++ b/TOF/AliTOFpidESD.h @@ -18,9 +18,9 @@ class AliTOFGeometry; class AliTOFpidESD : public TObject { enum {kMaxCluster=77777}; //maximal number of the TOF clusters public: - AliTOFpidESD(){fN=0; fEventN=0;} - AliTOFpidESD(Double_t *param); - ~AliTOFpidESD(){} + AliTOFpidESD(); + AliTOFpidESD(Double_t *param); + ~AliTOFpidESD(){} Int_t MakePID(AliESD *event); void SetEventNumber(Int_t n) {fEventN=n;} diff --git a/TOF/AliTOFtrack.cxx b/TOF/AliTOFtrack.cxx index 745fc9172a4..24f7431aaa3 100644 --- a/TOF/AliTOFtrack.cxx +++ b/TOF/AliTOFtrack.cxx @@ -28,14 +28,69 @@ #include "AliESDtrack.h" #include "AliLog.h" -#include "AliTOFGeometryV4.h" +#include "AliTOFGeometryV5.h" #include "AliTOFGeometry.h" #include "AliTOFtrack.h" ClassImp(AliTOFtrack) //_____________________________________________________________________________ -AliTOFtrack::AliTOFtrack(const AliTOFtrack& t) : AliKalmanTrack(t) { +AliTOFtrack::AliTOFtrack() : + AliKalmanTrack(), + fSeedInd(-1), + fSeedLab(-1), + fAlpha(0), + fX(0), + fY(0), + fZ(0), + fE(0), + fT(0), + fC(0), + fCyy(0), + fCzy(0), + fCzz(0), + fCey(0), + fCez(0), + fCee(0), + fCty(0), + fCtz(0), + fCte(0), + fCtt(0), + fCcy(0), + fCcz(0), + fCce(0), + fCct(0), + fCcc(0), + fTOFgeometry(0x0) + { +}//_____________________________________________________________________________ +AliTOFtrack::AliTOFtrack(const AliTOFtrack& t) : AliKalmanTrack(t), + fSeedInd(-1), + fSeedLab(-1), + fAlpha(0), + fX(0), + fY(0), + fZ(0), + fE(0), + fT(0), + fC(0), + fCyy(0), + fCzy(0), + fCzz(0), + fCey(0), + fCez(0), + fCee(0), + fCty(0), + fCtz(0), + fCte(0), + fCtt(0), + fCcy(0), + fCcz(0), + fCce(0), + fCct(0), + fCcc(0), + fTOFgeometry(0x0) + { // // Copy constructor. // @@ -56,18 +111,44 @@ AliTOFtrack::AliTOFtrack(const AliTOFtrack& t) : AliKalmanTrack(t) { fCty=t.fCty; fCtz=t.fCtz; fCte=t.fCte; fCtt=t.fCtt; fCcy=t.fCcy; fCcz=t.fCcz; fCce=t.fCce; fCct=t.fCct; fCcc=t.fCcc; - fTOFgeometry = new AliTOFGeometryV4(); + fTOFgeometry = new AliTOFGeometryV5(); } //_____________________________________________________________________________ -AliTOFtrack::AliTOFtrack(const AliESDtrack& t) - :AliKalmanTrack() { +AliTOFtrack::AliTOFtrack(const AliESDtrack& t): + AliKalmanTrack(), + fSeedInd(-1), + fSeedLab(-1), + fAlpha(0), + fX(0), + fY(0), + fZ(0), + fE(0), + fT(0), + fC(0), + fCyy(0), + fCzy(0), + fCzz(0), + fCey(0), + fCez(0), + fCee(0), + fCty(0), + fCtz(0), + fCte(0), + fCtt(0), + fCcy(0), + fCcz(0), + fCce(0), + fCct(0), + fCcc(0), + fTOFgeometry(0x0) + { // // Constructor from AliESDtrack // - fTOFgeometry = new AliTOFGeometryV4(); + fTOFgeometry = new AliTOFGeometryV5(); SetSeedIndex(-1); SetLabel(t.GetLabel()); diff --git a/TOF/AliTOFtrack.h b/TOF/AliTOFtrack.h index 4c8f534498e..9d149eadc16 100644 --- a/TOF/AliTOFtrack.h +++ b/TOF/AliTOFtrack.h @@ -25,7 +25,7 @@ class AliTOFtrack : public AliKalmanTrack { public: - AliTOFtrack():AliKalmanTrack(){} + AliTOFtrack(); AliTOFtrack(const AliTOFtrack& t); AliTOFtrack(const AliESDtrack& t); AliTOFtrack& operator=(const AliTOFtrack &source); // ass. op. diff --git a/TOF/AliTOFv4T0.cxx b/TOF/AliTOFv4T0.cxx index 1c4d2f38d4b..1b528efa55b 100644 --- a/TOF/AliTOFv4T0.cxx +++ b/TOF/AliTOFv4T0.cxx @@ -61,7 +61,14 @@ extern AliRun *gAlice; ClassImp(AliTOFv4T0) //_____________________________________________________________________________ -AliTOFv4T0::AliTOFv4T0() + AliTOFv4T0::AliTOFv4T0(): + fIdFTOA(-1), + fIdFTOB(-1), + fIdFTOC(-1), + fIdFLTA(-1), + fIdFLTB(-1), + fIdFLTC(-1), + fTOFHoles(kFALSE) { // // Default constructor @@ -69,8 +76,15 @@ AliTOFv4T0::AliTOFv4T0() } //_____________________________________________________________________________ -AliTOFv4T0::AliTOFv4T0(const char *name, const char *title) - : AliTOF(name,title,"tzero") +AliTOFv4T0::AliTOFv4T0(const char *name, const char *title): + AliTOF(name,title,"tzero"), + fIdFTOA(-1), + fIdFTOB(-1), + fIdFTOC(-1), + fIdFLTA(-1), + fIdFLTB(-1), + fIdFLTC(-1), + fTOFHoles(kFALSE) { // // Standard constructor diff --git a/TOF/AliTOFv5T0.cxx b/TOF/AliTOFv5T0.cxx index 0ebf0b848ac..b6b31ab0539 100644 --- a/TOF/AliTOFv5T0.cxx +++ b/TOF/AliTOFv5T0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.11 2006/07/12 16:03:44 arcelli +updates to match the new numbering of the TOF/TRD mother volumes in FRAME (ALICE convention) + Revision 1.10 2006/05/10 18:40:17 hristov Larger strings for the names @@ -100,7 +103,14 @@ extern AliRun *gAlice; ClassImp(AliTOFv5T0) //_____________________________________________________________________________ -AliTOFv5T0::AliTOFv5T0() + AliTOFv5T0::AliTOFv5T0(): + fIdFTOA(-1), + fIdFTOB(-1), + fIdFTOC(-1), + fIdFLTA(-1), + fIdFLTB(-1), + fIdFLTC(-1), + fTOFHoles(kFALSE) { // // Default constructor @@ -108,8 +118,15 @@ AliTOFv5T0::AliTOFv5T0() } //_____________________________________________________________________________ -AliTOFv5T0::AliTOFv5T0(const char *name, const char *title) - : AliTOF(name,title,"tzero") +AliTOFv5T0::AliTOFv5T0(const char *name, const char *title): + AliTOF(name,title,"tzero"), + fIdFTOA(-1), + fIdFTOB(-1), + fIdFTOC(-1), + fIdFLTA(-1), + fIdFLTB(-1), + fIdFLTC(-1), + fTOFHoles(kFALSE) { // // Standard constructor -- 2.43.0