X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOF.cxx;h=14bffafbf27ef9ae709759aadc7984d8c088ee65;hb=06d2671d551ca658f867500cc818045694a24778;hp=c91b02f69b63570104157f86c3ad965abeddcd80;hpb=849bff36b8e3947e20e4e1db5ed138605a1c4ade;p=u%2Fmrichter%2FAliRoot.git
diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx
index c91b02f69b6..14bffafbf27 100644
--- a/TOF/AliTOF.cxx
+++ b/TOF/AliTOF.cxx
@@ -12,7 +12,6 @@
* about the suitability of this software for any purpose. It is *
* provided "as is" without express or implied warranty. *
**************************************************************************/
-
/* $Id$ */
///////////////////////////////////////////////////////////////////////////////
@@ -21,83 +20,99 @@
// This class contains the basic functions for the Time Of Flight //
// detector. Functions specific to one particular geometry are //
// contained in the derived classes //
-//
-// VERSIONE WITH 5 SYMMETRIC MODULES ALONG Z AXIS
-// ==============================================
-//
-// VERSION WITH HOLES FOR PHOS AND TRD IN SPACEFRAME WITH HOLES
-//
-// Volume sensibile : FPAD
-//
-//
-//
+// //
+// VERSIONE WITH 5 SYMMETRIC MODULES ALONG Z AXIS //
+// ============================================================ //
+// //
+// VERSION WITH HOLES FOR PHOS AND TRD IN SPACEFRAME WITH HOLES //
+// //
+// Volume sensibile : FPAD //
+// //
+// //
+// //
+// //
+///////////////////////////////////////////////////////////////////////////////
// Begin_Html
/*
*/
//End_Html
-//
-//
-// //
-///////////////////////////////////////////////////////////////////////////////
-
-#include
-#include
-#include
-
-#include
+#include
#include
#include
-#include
-#include
#include
-#include
-#include
#include
#include
+#include
-#include "AliConfig.h"
-#include "AliHeader.h"
#include "AliConst.h"
#include "AliLoader.h"
-#include "AliMagF.h"
+#include "AliLog.h"
+#include "AliMC.h"
#include "AliRun.h"
-#include "AliTOF.h"
-#include "AliTOFGeometry.h"
-#include "AliTOFSDigit.h"
+#include "AliDAQ.h"
+#include "AliRawReader.h"
+
+//#include "AliTOFDDLRawData.h"
+#include "AliTOFDigitizer.h"
#include "AliTOFdigit.h"
-#include "AliTOFhit.h"
#include "AliTOFhitT0.h"
-#include "AliMC.h"
-#include "AliTOFDigitizer.h"
-#include "AliTOFDDLRawData.h"
-
+#include "AliTOFhit.h"
+#include "AliTOFGeometry.h"
+#include "AliTOFSDigitizer.h"
+#include "AliTOFSDigit.h"
+#include "AliTOF.h"
+#include "AliTOFrawData.h"
+#include "AliTOFRawStream.h"
+
+class AliTOFcluster;
+
+// extern TROOT *gROOT;
+// extern TVirtualMC *TVirtualMC::GetMC();
+
+// extern AliRun *gAlice;
+
ClassImp(AliTOF)
-
+
//_____________________________________________________________________________
-AliTOF::AliTOF()
+AliTOF::AliTOF():
+ fFGeom(0x0),
+ fSDigits(0x0),
+ fNSDigits(0),
+ fReconParticles(0x0),
+ fIdSens(-1),
+ fTZero(kFALSE),
+ fTOFHoles(kTRUE),
+ fTOFGeometry(0x0),
+ fTOFRawWriter(AliTOFDDLRawData())
{
//
// Default constructor
//
- fFGeom = 0x0;
- fDTask = 0x0;
- fReTask = 0x0;
+
+ //by default all sectors switched on
+ for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0;
+
+ fDigits = 0;
fIshunt = 0;
- fSDigits = 0 ;
- fNSDigits = 0;
- fDigits = 0 ;
- fReconParticles = 0x0;
- fName="TOF";
- fMerger = 0x0;
- 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),
+ fSDigits(0x0),
+ fNSDigits(0),
+ fReconParticles(0x0),
+ fIdSens(-1),
+ fTZero(kFALSE),
+ fTOFHoles(kTRUE),
+ fTOFGeometry(0x0),
+ fTOFRawWriter(AliTOFDDLRawData())
{
//
// AliTOF standard constructor
@@ -107,47 +122,42 @@ 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;
- fMerger = 0x0;
- fTOFGeometry = 0;
+ //skowron
+ fTOFGeometry = new AliTOFGeometry();
+
+ //by default all sectors switched on
+ for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0;
if (strstr(option,"tzero")){
fHits = new TClonesArray("AliTOFhitT0", 1000);
fTZero = kTRUE;
- cout << "tzero option requires AliTOFv4T0 as TOF version (check Your Config.C)" << endl;
+ // AliWarning("tzero option requires AliTOFv4T0/AliTOFv5T0 as TOF version (check Your Config.C)");
}else{
fHits = new TClonesArray("AliTOFhit", 1000);
fTZero = kFALSE;
}
if (gAlice==0) {
- Fatal("AliTOF","gAlice==0 !");
+ AliFatal("gAlice==0 !");
}
- if (gAlice->GetMCApp()->GetHitLists())
- gAlice->GetMCApp()->AddHitList(fHits);
- else Error("AliTOF","gAlice->GetHitLists()==0");
+
+ AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
+
+ if (mcApplication->GetHitLists())
+ mcApplication->AddHitList(fHits);
+ else AliError("gAlice->GetHitLists()==0");
fIshunt = 0;
fSDigits = new TClonesArray("AliTOFSDigit", 1000);
fDigits = new TClonesArray("AliTOFdigit", 1000);
- fNSDigits = 0;
-
- fFGeom = 0x0;
- fDTask = 0x0;
- fReTask = 0x0;
- fReconParticles = 0x0;
- fMerger = 0x0;
//
// Digitization parameters
//
// (Transfer Functions to be inserted here)
//
- SetMarkerColor(7);
- SetMarkerStyle(2);
- SetMarkerSize(0.4);
+ //PH SetMarkerColor(7);
+ //PH SetMarkerStyle(2);
+ //PH SetMarkerSize(0.4);
// Strip Parameters
//fGapA = 4.; //cm Gap beetween tilted strip in A-type plate
@@ -159,11 +169,29 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
}
+//____________________________________________________________________________
+void AliTOF::SetTOFSectors(Int_t * const sectors)
+{
+ // Setter for partial/full TOF configuration
+
+ for(Int_t isec=0;isec<18;isec++){
+ fTOFSectors[isec]=sectors[isec];
+ }
+}
+//____________________________________________________________________________
+void AliTOF::GetTOFSectors(Int_t *sectors) const
+{
+ // Getter for partial/full TOF configuration
+
+ for(Int_t isec=0;isec<18;isec++){
+ sectors[isec]=fTOFSectors[isec];
+ }
+}
+
//_____________________________________________________________________________
void AliTOF::CreateTOFFolders()
{
// create the ALICE TFolder
- // create the ALICE TTasks
// create the ALICE main TFolder
// to be done by AliRun
@@ -176,29 +204,6 @@ void AliTOF::CreateTOFFolders()
aliceF->SetOwner() ;
// geometry folder
TFolder * geomF = aliceF->AddFolder("Geometry", "Geometry objects") ;
- TFolder * aliceT = alice->AddFolder("tasks", "Alice tasks Folder") ;
- // make it the owner of the objects that it contains
- aliceT->SetOwner() ;
-
- TTask * aliceDi = new TTask("(S)Digitizer", "Alice SDigitizer & Digitizer") ;
- aliceT->Add(aliceDi);
-
- TTask * aliceRe = new TTask("Reconstructioner", "Alice Reconstructioner") ;
- aliceT->Add(aliceRe);
-
- char * tempo = new char[80] ;
-
- // creates the TOF Digitizer and adds it to alice main (S)Digitizer task
- sprintf(tempo, "%sDigitizers container",GetName() ) ;
- fDTask = new TTask(GetName(), tempo);
- aliceDi->Add(fDTask) ;
-
- // creates the TOF reconstructioner and adds it to alice main Reconstructioner task
- sprintf(tempo, "%sReconstructioner container",GetName() ) ;
- fReTask = new TTask(GetName(), tempo);
- aliceRe->Add(fReTask) ;
-
- delete [] tempo ;
// creates the TOF geometry folder
geomF->AddFolder("TOF", "Geometry for TOF") ;
@@ -209,7 +214,6 @@ AliTOF::~AliTOF()
{
// dtor:
// it remove also the alice folder
- // and task that TOF creates instead of AliRun
/* PH Temporarily commented because of problems
TFolder * alice = (TFolder*)gROOT->GetListOfBrowsables()->FindObject("FPAlice") ;
delete alice;
@@ -233,6 +237,7 @@ AliTOF::~AliTOF()
delete fSDigits;
fSDigits = 0;
}
+
if (fReconParticles)
{
fReconParticles->Delete ();
@@ -265,7 +270,7 @@ void AliTOF::AddT0Hit(Int_t track, Int_t *vol, Float_t *hits)
}
//_____________________________________________________________________________
-void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Float_t *digits)
+void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Int_t *digits)
{
//
// Add a TOF digit
@@ -275,8 +280,8 @@ void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Float_t *digits)
new (ldigits[fNdigits++]) AliTOFdigit(tracks, vol, digits);
}
-//___________________________________________
-void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Float_t *digits)
+//_____________________________________________________________________________
+void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Int_t *digits)
{
//
@@ -291,7 +296,6 @@ void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Float_t *digits)
void AliTOF::SetTreeAddress ()
{
// Set branch address for the Hits and Digits Tree.
- char branchname[30];
if (fLoader->TreeH())
{
@@ -304,17 +308,6 @@ void AliTOF::SetTreeAddress ()
AliDetector::SetTreeAddress ();
TBranch *branch;
- TTree *treeD = fLoader->TreeD();
-
- if (treeD)
- {
- branch = treeD->GetBranch (branchname);
- if (branch)
- {
- if (fDigits == 0x0) fDigits = new TClonesArray("AliTOFdigit", 1000);
- branch->SetAddress (&fDigits);
- }
- }
if (fLoader->TreeS () )
{
@@ -325,6 +318,17 @@ void AliTOF::SetTreeAddress ()
}
}
+ if (fLoader->TreeR() )
+ {
+ branch = fLoader->TreeR()->GetBranch("TOF");
+ if (branch)
+ {
+ if (fReconParticles == 0x0) fReconParticles = new TClonesArray("AliTOFcluster", 1000);
+ branch->SetAddress(&fReconParticles);
+ }
+ }
+
+ /*
if (fLoader->TreeR() && fReconParticles) //I do not know where this array is created - skowron
{
branch = fLoader->TreeR()->GetBranch("TOF");
@@ -332,7 +336,8 @@ void AliTOF::SetTreeAddress ()
{
branch->SetAddress(&fReconParticles) ;
}
- }
+ }
+ */
}
//_____________________________________________________________________________
@@ -347,217 +352,42 @@ void AliTOF::CreateGeometry()
*/
//End_Html
//
- const Double_t kPi=TMath::Pi();
- const Double_t kDegrad=kPi/180.;
- //
- Float_t xTof, yTof, wall;
- // frame inbetween TOF modules
- wall = 4.;//cm
+ Float_t xTof, yTof;
- // Sizes of TOF module with its support etc..
- xTof = 2.*(AliTOFGeometry::Rmin()*TMath::Tan(10*kDegrad)-wall/2-.5);
- yTof = AliTOFGeometry::Rmax()-AliTOFGeometry::Rmin();
+ if (IsVersion()==8) {
-// TOF module internal definitions
- //TOFpc(xTof, yTof, fZlenC, fZlenB, fZlenA, AliTOFGeometry::MaxhZtof());
- TOFpc(xTof, yTof, AliTOFGeometry::ZlenC(), AliTOFGeometry::ZlenB(), AliTOFGeometry::ZlenA(), AliTOFGeometry::MaxhZtof());
-}
+ xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm, x-dimension of FTOA volume
+ yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm, y-dimension of FTOA volume
+ Float_t zTof = fTOFGeometry->ZlenA(); // cm, z-dimension of FTOA volume
+
+ // TOF module internal definitions
+ TOFpc(xTof, yTof, zTof);
-//_____________________________________________________________________________
-void AliTOF::DrawModule() const
-{
- //
- // Draw a shaded view of the common part of the TOF geometry
- //
+ } else if (IsVersion()==7) {
- cout << " Drawing of AliTOF"<< endl;
- // Set everything unseen
- gMC->Gsatt("*", "seen", -1);
- //
- // Set ALIC mother transparent
- gMC->Gsatt("ALIC","SEEN",0);
- //
- // Set the volumes visible
- gMC->Gsatt("FTOA","SEEN",1);
- gMC->Gsatt("FTOB","SEEN",1);
- gMC->Gsatt("FTOC","SEEN",1);
- gMC->Gsatt("FLTA","SEEN",1);
- gMC->Gsatt("FLTB","SEEN",1);
- gMC->Gsatt("FLTC","SEEN",1);
- gMC->Gsatt("FSTR","SEEN",1);
- //
- gMC->Gdopt("hide", "on");
- gMC->Gdopt("shad", "on");
- gMC->Gsatt("*", "fill", 7);
- gMC->SetClipBox(".");
- gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
- gMC->DefaultRange();
- gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
- gMC->Gdhead(1111, "Time Of Flight");
- gMC->Gdman(18, 4, "MAN");
- gMC->Gdopt("hide","off");
-}
+ xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm, x-dimension of FTOA volume
+ yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm, y-dimension of FTOA volume
+ Float_t zTof = fTOFGeometry->ZlenA(); // cm, z-dimension of FTOA volume
+
+ // TOF module internal definitions
+ TOFpc(xTof, yTof, zTof, fTOFGeometry->ZlenB());
-//_____________________________________________________________________________
-void AliTOF::CreateMaterials()
-{
- //
- // Defines TOF materials for all versions
- // Revision: F. Pierella 18-VI-2002
- //
+ } else {
- Int_t isxfld = gAlice->Field()->Integ();
- Float_t sxmgmx = gAlice->Field()->Max();
- //
- //--- Quartz (SiO2) to simulate float glass
- // density tuned to have correct float glass
- // radiation length
- Float_t aq[2] = { 28.0855,15.9994 };
- Float_t zq[2] = { 14.,8. };
- Float_t wq[2] = { 1.,2. };
- Float_t dq = 2.55; // std value: 2.2
- Int_t nq = -2;
-
- // --- Freon C2F4H2 (TOF-TDR pagg.)
- // Geant Manual CONS110-1, pag. 43 (Geant, Detector Description and Simulation Tool)
- Float_t afre[3] = {12.011,18.998,1.007};
- Float_t zfre[3] = { 6., 9., 1.};
- Float_t wfre[3] = { 2., 4., 2.};
- Float_t densfre = 0.00375;
-// http://www.fi.infn.it/sezione/prevprot/gas/freon.html
- Int_t nfre = -3;
-/*
- //-- Isobutane quencher C4H10 (5% in the sensitive mixture)
- Float_t aiso[2] = {12.011,1.007};
- Float_t ziso[2] = { 6., 1.};
- Float_t wiso[2] = { 4., 10.};
- Float_t densiso = .......; // (g/cm3) density
- Int_t nfre = -2; // < 0 i.e. proportion by number of atoms of each kind
- //-- SF6 (5% in the sensitive mixture)
- Float_t asf[3] = {32.066,18.998};
- Float_t zsf[3] = { 16., 9.};
- Float_t wsf[3] = { 1., 6.};
- Float_t denssf = .....; // (g/cm3) density
- Int_t nfre = -2; // < 0 i.e. proportion by number of atoms of each kind
-*/
- // --- CO2
- Float_t ac[2] = {12.,16.};
- Float_t zc[2] = { 6., 8.};
- Float_t wc[2] = { 1., 2.};
- Float_t dc = .001977;
- Int_t nc = -2;
- // For mylar (C5H4O2)
- Float_t amy[3] = { 12., 1., 16. };
- Float_t zmy[3] = { 6., 1., 8. };
- Float_t wmy[3] = { 5., 4., 2. };
- Float_t dmy = 1.39;
- Int_t nmy = -3;
- // For polyethilene (CH2) - honeycomb -
- Float_t ape[2] = { 12., 1. };
- Float_t zpe[2] = { 6., 1. };
- Float_t wpe[2] = { 1., 2. };
- Float_t dpe = 0.935*0.479; //To have 1%X0 for 1cm as for honeycomb
- Int_t npe = -2;
- // --- G10
- Float_t ag10[4] = { 12.,1.,16.,28. };
- Float_t zg10[4] = { 6.,1., 8.,14. };
- Float_t wmatg10[4] = { .259,.288,.248,.205 };
- Float_t densg10 = 1.7;
- Int_t nlmatg10 = -4;
-
- // plexiglass CH2=C(CH3)CO2CH3
- Float_t aplex[3] = { 12.,1.,16.};
- Float_t zplex[3] = { 6.,1., 8.};
- Float_t wmatplex[3] = {5.,8.,2.};
- Float_t densplex =1.16;
- Int_t nplex = -3;
-
- // ---- ALUMINA (AL203)
- Float_t aal[2] = { 27.,16.};
- Float_t zal[2] = { 13., 8.};
- Float_t wmatal[2] = { 2.,3. };
- Float_t densal = 2.3;
- Int_t nlmatal = -2;
- // -- Water
- Float_t awa[2] = { 1., 16. };
- Float_t zwa[2] = { 1., 8. };
- Float_t wwa[2] = { 2., 1. };
- Float_t dwa = 1.0;
- Int_t nwa = -2;
-
-// stainless steel
- Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
- Float_t zsteel[4] = { 26.,24.,28.,14. };
- Float_t wsteel[4] = { .715,.18,.1,.005 };
-
- //AliMaterial(0, "Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-
- // AIR
- Float_t aAir[4]={12.0107,14.0067,15.9994,39.948};
- Float_t zAir[4]={6.,7.,8.,18.};
- Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
- Float_t dAir = 1.20479E-3;
-
- AliMixture( 1, "Air$", aAir, zAir, dAir, 4, wAir);
-
- AliMaterial( 2, "Cu $", 63.54, 29.0, 8.96, 1.43, 14.8);
- AliMaterial( 3, "C $", 12.01, 6.0, 2.265,18.8, 74.4);
- AliMixture ( 4, "Polyethilene$", ape, zpe, dpe, npe, wpe);
- AliMixture ( 5, "G10$", ag10, zg10, densg10, nlmatg10, wmatg10);
- AliMixture ( 6, "PLE$", aplex, zplex, densplex, nplex, wmatplex);
- AliMixture ( 7, "CO2$", ac, zc, dc, nc, wc);
- AliMixture ( 8, "ALUMINA$", aal, zal, densal, nlmatal, wmatal);
- AliMaterial( 9, "Al $", 26.98, 13., 2.7, 8.9, 37.2);
- AliMaterial(10, "C-TRD$", 12.01, 6., 2.265*18.8/69.282*15./100, 18.8, 74.4); // for 15%
- AliMixture (11, "Mylar$", amy, zmy, dmy, nmy, wmy);
- AliMixture (12, "Freon$", afre, zfre, densfre, nfre, wfre);
- AliMixture (13, "Glass$", aq, zq, dq, nq, wq);
- AliMixture (14, "Water$", awa, zwa, dwa, nwa, wwa);
- AliMixture (15, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-
- Float_t epsil, stmin, deemax, stemax;
-
- // Previous data
- // EPSIL = 0.1 ! Tracking precision,
- // STEMAX = 0.1 ! Maximum displacement for multiple scattering
- // DEEMAX = 0.1 ! Maximum fractional energy loss, DLS
- // STMIN = 0.1
- //
- // New data
- epsil = .001; // Tracking precision,
- stemax = -1.; // Maximum displacement for multiple scattering
- deemax = -.3; // Maximum fractional energy loss, DLS
- stmin = -.8;
-
- AliMedium( 1, "Air$" , 1, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 2, "Cu $" , 2, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 3, "C $" , 3, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 4, "Pol$" , 4, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 5, "G10$" , 5, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 6, "PLE$" , 6, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 7, "CO2$" , 7, 0, isxfld, sxmgmx, 10., -.01, -.1, .01, -.01);
- AliMedium( 8,"ALUMINA$", 8, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium( 9,"Al Frame$",9, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(10, "DME-S$", 6, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(11, "C-TRD$", 10, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(12, "Myl$" , 11, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(13, "Fre$" , 12, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(14, "Fre-S$", 12, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(15, "Glass$", 13, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(16, "Water$", 14, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
- AliMedium(17, "STEEL$", 15, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-}
+ Float_t wall = 4.;//cm // frame inbetween TOF modules
+
+ // Sizes of TOF module with its support etc..
+ xTof = 2.*(fTOFGeometry->Rmin()*TMath::Tan(10.*kDegrad)-wall/2.-0.5);
+ yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin();
+
+ // TOF module internal definitions
+ TOFpc(xTof, yTof, fTOFGeometry->ZlenC(), fTOFGeometry->ZlenB(), fTOFGeometry->ZlenA(), fTOFGeometry->MaxhZtof());
+ }
-//_____________________________________________________________________________
-Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t ) const
-{
- //
- // Returns distance from mouse pointer to detector, default version
- //
- return 9999;
}
+
//___________________________________________
void AliTOF::ResetHits ()
{
@@ -589,8 +419,15 @@ void AliTOF::Init()
// Initialise TOF detector after it has been built
//
// Set id of TOF sensitive volume
- if (IsVersion() !=0) fIdSens=gMC->VolId("FPAD");
- //
+ if (IsVersion() !=0) fIdSens=TVirtualMC::GetMC()->VolId("FPAD");
+
+ /*
+ // Save the geometry
+ TDirectory* saveDir = gDirectory;
+ AliRunLoader::Instance()->CdGAFile();
+ fTOFGeometry->Write("TOFGeometry");
+ saveDir->cd();
+ */
}
//____________________________________________________________________________
@@ -616,8 +453,9 @@ void AliTOF::MakeBranch(Option_t* option)
AliDetector::MakeBranch(option);
Int_t buffersize = 4000;
- Char_t branchname[10];
- sprintf(branchname,"%s",GetName());
+ const Int_t kSize=10;
+ Char_t branchname[kSize];
+ snprintf(branchname,kSize,"%s",GetName());
const char *oD = strstr(option,"D");
const char *oS = strstr(option,"S");
@@ -633,9 +471,16 @@ void AliTOF::MakeBranch(Option_t* option)
MakeBranchInTree(fLoader->TreeS(), branchname, &fSDigits,buffersize, 0) ;
}
+ if (fLoader->TreeR() && oR){
+ if (fReconParticles == 0x0) fReconParticles = new TClonesArray("AliTOFcluster", 1000);
+ MakeBranchInTree(fLoader->TreeR(), branchname, &fReconParticles,buffersize, 0) ;
+ }
+
+ /*
if (fReconParticles && fLoader->TreeR() && oR){
MakeBranchInTree(fLoader->TreeR(), branchname, &fReconParticles,buffersize, 0) ;
}
+ */
}
//____________________________________________________________________________
@@ -644,13 +489,13 @@ void AliTOF::Makehits(Bool_t hits)
// default argument used, see AliTOF.h
// Enable/Disable the writing of the TOF-hits branch
// on TreeH
-// by default : enabled for TOFv1, v2, v3, v4
+// by default : enabled for TOFv1, v2, v3, v4, v5
// disabled for TOFv0
//
if (hits && (IsVersion()!=0))
- fIdSens = gMC->VolId("FPAD");
+ fIdSens = TVirtualMC::GetMC()->VolId("FPAD");
else
- cout << "Option for writing the TOF-hits branch on TreeH: disabled" << endl;
+ AliInfo("Option for writing the TOF-hits branch on TreeH: disabled");
}
//____________________________________________________________________________
@@ -659,62 +504,30 @@ void AliTOF::FinishEvent()
// do nothing
}
-//___________________________________________
-void AliTOF::SDigits2Digits()
-{
-//
-// Generate digits performing merging
-//
- /*
- int nparticles = gAlice->GetNtrack();
- cout << "Particles :" < 0 ) {
-
- AliTOF::Hits2Digits();
-
- }
- */
- cout<<"AliTOF::SDigits2Digits"<Init();
- cout<<"AliTOF::SDigits2Digits Init"<Digitise();
- cout<<"AliTOF::SDigits2Digits Digitise() "< start...\n";
+// AliInfo("Start...");
AliRunLoader * rl = fLoader->GetRunLoader();
+ AliDebug(2,"Initialized runLoader");
AliTOFSDigitizer sd((rl->GetFileName()).Data());
- if (GetDebug()) sd.Print("");
+ AliDebug(2,"Initialized TOF sdigitizer");
+ //ToAliDebug(1, sd.Print(""));
+ //AliInfo("ToAliDebug");
+
+ //sd.Digitize("all") ;
+ sd.Digitize("partial") ;
- sd.Exec("") ;
+ AliDebug(2,"I am sorting from AliTOF class");
}
-//---------------------------------------------------------------------
+//____________________________________________________________________________
void AliTOF::Hits2SDigits(Int_t evNumber1, Int_t evNumber2)
{
//
@@ -722,27 +535,28 @@ void AliTOF::Hits2SDigits(Int_t evNumber1, Int_t evNumber2)
//
if ((evNumber2-evNumber1)==1)
- cout << ": I am making sdigits for the " << evNumber1 << "th event \n";
- else if ((evNumber2-evNumber1)>1)
- cout << ": I am making sdigits for the events from the "
- << evNumber1 << "th to the " << evNumber2-1 << "th \n";
+ AliDebug(1, Form("I am making sdigits for the %dth event", evNumber1));
+ if ((evNumber2-evNumber1)>1)
+ AliDebug(1, Form("I am making sdigits for the events from the %dth to the %dth", evNumber1, evNumber2-1));
AliRunLoader * rl = fLoader->GetRunLoader();
AliTOFSDigitizer sd((rl->GetFileName()).Data(),evNumber1,evNumber2) ;
- if (GetDebug()) sd.Print("");
+ ToAliDebug(1, sd.Print(""));
- sd.Exec("") ;
+ sd.Digitize("") ;
}
//___________________________________________________________________________
-AliDigitizer* AliTOF::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliTOF::CreateDigitizer(AliDigitizationInput* digInput) const
{
- return new AliTOFDigitizer(manager);
+ AliDebug(2,"I am creating the TOF digitizer");
+ return new AliTOFDigitizer(digInput);
}
//___________________________________________________________________________
-Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
+Bool_t AliTOF::CheckOverlap(const Int_t * const vol,
+ Int_t* digit,Int_t Track)
{
//
// Checks if 2 or more hits belong to the same pad.
@@ -753,50 +567,48 @@ Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
// This procedure has to be optimized in the next TOF release.
//
- Bool_t overlap = kFALSE;
- Int_t vol2[5];
-
- for (Int_t ndig=0; ndigGetEntries(); ndig++){
- AliTOFdigit* currentDigit = (AliTOFdigit*)(fSDigits->UncheckedAt(ndig));
- currentDigit->GetLocation(vol2);
- Bool_t idem= kTRUE;
- // check on digit volume
- for (Int_t i=0;i<=4;i++){
- if (!idem) break;
- if (vol[i]!=vol2[i]) idem=kFALSE;}
-
- if (idem){ // same pad fired
- Float_t tdc2 = digit[0];
- Float_t tdc1 = currentDigit->GetTdc();
-
- // we separate two digits on the same pad if
- // they are separated in time by at least 25 ns
- // remember that tdc time is given in ps
-
- if (TMath::Abs(tdc1-tdc2)<25000){
- // in case of overlap we take the earliest
- if (tdc1>tdc2){
- currentDigit->SetTdc(tdc2);
- currentDigit->SetAdc(digit[1]);
- }
- else {
- currentDigit->SetTdc(tdc1);
- currentDigit->SetAdc(digit[1]);
- }
- currentDigit->AddTrack(Track); // add track number in the track array
- overlap = kTRUE;
- return overlap;
- } else
- overlap= kFALSE;
-
- } // close if (idem) -> two digits on the same TOF pad
-
- } // end loop on existing sdigits
-
- return overlap;
+ Bool_t overlap = kFALSE;
+ Int_t vol2[5];
+
+ for (Int_t ndig=0; ndigGetEntries(); ndig++){
+ AliTOFdigit* currentDigit = (AliTOFdigit*)(fSDigits->UncheckedAt(ndig));
+ currentDigit->GetLocation(vol2);
+ Bool_t idem= kTRUE;
+ // check on digit volume
+ for (Int_t i=0;i<=4;i++){
+ if (!idem) break;
+ if (vol[i]!=vol2[i]) idem=kFALSE;}
+
+ if (idem){ // same pad fired
+ Int_t tdc2 = digit[0];
+ Int_t tdc1 = currentDigit->GetTdc();
+
+ // we separate two digits on the same pad if
+ // they are separated in time by at least 25 ns
+ // remember that tdc time is given in ps
+
+ if (TMath::Abs(tdc1-tdc2)<25000){
+ // in case of overlap we take the earliest
+ if (tdc1>tdc2){
+ currentDigit->SetTdc(tdc2);
+ currentDigit->SetAdc(digit[1]);
+ }
+ else {
+ currentDigit->SetTdc(tdc1);
+ currentDigit->SetAdc(digit[1]);
+ }
+ currentDigit->AddTrack(Track); // add track number in the track array
+ overlap = kTRUE;
+ return overlap;
+ } else
+ overlap= kFALSE;
+
+ } // close if (idem) -> two digits on the same TOF pad
+
+ } // end loop on existing sdigits
+
+ return overlap;
}
-
-
//____________________________________________________________________________
void AliTOF::Digits2Raw()
{
@@ -804,34 +616,46 @@ void AliTOF::Digits2Raw()
// Starting from the TOF digits, writes the Raw Data objects
//
+ TStopwatch stopwatch;
+ stopwatch.Start();
+
fLoader->LoadDigits();
TTree* digits = fLoader->TreeD();
if (!digits) {
- Error("Digits2Raw", "no digits tree");
+ AliError("no digits tree");
return;
}
- AliTOFDDLRawData rawWriter;
- rawWriter.SetVerbose(0);
+ //AliTOFDDLRawData rawWriter;
+ fTOFRawWriter.Clear();
+ fTOFRawWriter.SetVerbose(0);
+ if (fTOFRawWriter.GetPackedAcquisitionMode()) {
+ if(fTOFRawWriter.GetMatchingWindow()>8192)
+ AliWarning(Form("You are running in packing mode and the matching window is %.2f ns, i.e. greater than 199.8848 ns",
+ fTOFRawWriter.GetMatchingWindow()*AliTOFGeometry::TdcBinWidth()*1.e-03));
+ }
- Info("Digits2Raw", "Formatting raw data for TOF");
+ AliDebug(1,"Formatting raw data for TOF");
digits->GetEvent(0);
- rawWriter.RawDataTOF(digits->GetBranch("TOF"));
+ fTOFRawWriter.RawDataTOF(digits->GetBranch("TOF"));
fLoader->UnloadDigits();
+ AliDebug(1, Form("Execution time to write TOF raw data : R:%.2fs C:%.2fs",
+ stopwatch.RealTime(),stopwatch.CpuTime()));
+
}
-////////////////////////////////////////////////////////////////////////
+
+//____________________________________________________________________________
void AliTOF::RecreateSDigitsArray() {
//
// delete TClonesArray fSDigits and create it again
// needed for backward compatability with PPR test production
//
- delete fSDigits;
- fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+ fSDigits->Clear();
}
-////////////////////////////////////////////////////////////////////////
+//____________________________________________________________________________
void AliTOF::CreateSDigitsArray() {
//
// create TClonesArray fSDigits
@@ -839,4 +663,58 @@ void AliTOF::CreateSDigitsArray() {
//
fSDigits = new TClonesArray("AliTOFSDigit", 1000);
}
+//____________________________________________________________________________
+Bool_t AliTOF::Raw2SDigits(AliRawReader* rawReader)
+{
+ //
+ // Converts raw data to sdigits for TOF
+ //
+ TStopwatch stopwatch;
+ stopwatch.Start();
+
+ if(!GetLoader()->TreeS()) {MakeTree("S"); MakeBranch("S");}
+ //TClonesArray &aSDigits = *fSDigits;
+
+ AliTOFRawStream tofRawStream = AliTOFRawStream();
+ tofRawStream.Raw2SDigits(rawReader, fSDigits);
+
+ GetLoader()->TreeS()->Fill(); GetLoader()->WriteSDigits("OVERWRITE");//write out sdigits
+ Int_t nSDigits = fSDigits->GetEntries();
+
+ ResetSDigits();
+
+ AliDebug(1, Form("Got %d TOF sdigits", nSDigits));
+ AliDebug(1, Form("Execution time to read TOF raw data and fill TOF sdigit tree : R:%.2fs C:%.2fs",
+ stopwatch.RealTime(),stopwatch.CpuTime()));
+
+ return kTRUE;
+
+}
+
+//____________________________________________________________________________
+void AliTOF::Raw2Digits(AliRawReader* rawReader)
+{
+ //
+ // Converts raw data to digits for TOF
+ //
+
+ TStopwatch stopwatch;
+ stopwatch.Start();
+
+ if(!GetLoader()->TreeD()) {MakeTree("D"); MakeBranch("D");}
+ //TClonesArray &aDigits = *fDigits;
+
+ AliTOFRawStream tofRawStream = AliTOFRawStream();
+ tofRawStream.Raw2Digits(rawReader, fDigits);
+
+ GetLoader()->TreeD()->Fill(); GetLoader()->WriteDigits("OVERWRITE");//write out digits
+ Int_t nDigits = fDigits->GetEntries();
+
+ ResetDigits();
+
+ AliDebug(1, Form("Got %d TOF digits", nDigits));
+ AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs",
+ stopwatch.RealTime(),stopwatch.CpuTime()));
+
+}