* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.22 2001/08/28 08:45:58 vicinanz
-TTask and TFolder structures implemented
-
-Revision 1.21 2001/05/16 14:57:24 alibrary
-New files for folders and Stack
-
-Revision 1.20 2001/05/04 10:09:47 vicinanz
-Major upgrades to the strip structure
-
-Revision 1.19 2001/03/12 17:47:25 hristov
-Changes needed on Sun with CC 5.0
-
-Revision 1.18 2001/01/26 19:57:42 hristov
-Major upgrade of AliRoot code
-
-Revision 1.17 2000/10/19 09:58:14 vicinanz
-Updated Hits2Digit procedure
-
-Revision 1.16 2000/10/02 21:28:17 fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.15 2000/05/18 14:33:01 vicinanz
-Modified to be full HP compliant
-
-Revision 1.14 2000/05/15 19:32:36 fca
-Add AddHitList !!
-
-Revision 1.13 2000/05/10 16:52:18 vicinanz
-New TOF version with holes for PHOS/RICH
-
-Revision 1.11.2.1 2000/05/10 09:37:15 vicinanz
-New version with Holes for PHOS/RICH
-
-Revision 1.11 1999/11/05 22:39:06 fca
-New hits structure
-
-Revision 1.10 1999/11/01 20:41:57 fca
-Added protections against using the wrong version of FRAME
-
-Revision 1.9 1999/10/15 15:35:19 fca
-New version for frame1099 with and without holes
-
-Revision 1.9 1999/09/29 09:24:33 fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
///////////////////////////////////////////////////////////////////////////////
// //
// //
///////////////////////////////////////////////////////////////////////////////
-#include <iostream.h>
-#include <strstream.h>
-#include "AliTOF.h"
-#include "AliTOFhit.h"
-#include "AliTOFdigit.h"
-#include "AliTOFRawSector.h"
-#include "AliTOFRoc.h"
-#include "AliTOFRawDigit.h"
+#include <Riostream.h>
+#include <Rstrstream.h>
+#include <stdlib.h>
-#include "TROOT.h"
-#include "TBRIK.h"
-#include "TNode.h"
-#include "TObject.h"
-#include "TSystem.h"
-#include "TTree.h"
-#include "TFile.h"
-#include "TFolder.h"
-#include "TTask.h"
+#include <TBRIK.h>
+#include <TFile.h>
+#include <TFolder.h>
+#include <TNode.h>
+#include <TObject.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TTask.h>
+#include <TTree.h>
+#include <TVirtualMC.h>
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliMagF.h"
#include "AliConst.h"
-
+#include "AliLoader.h"
+#include "AliMagF.h"
+#include "AliRun.h"
+#include "AliTOF.h"
+#include "AliTOFRawDigit.h"
+#include "AliTOFRawSector.h"
+#include "AliTOFRoc.h"
+#include "AliTOFSDigit.h"
+#include "AliTOFdigit.h"
+#include "AliTOFhit.h"
+#include "AliTOFhitT0.h"
ClassImp(AliTOF)
//
// Default constructor
//
+ fFGeom = 0x0;
+ fDTask = 0x0;
+ fReTask = 0x0;
fIshunt = 0;
fSDigits = 0 ;
+ fNSDigits = 0;
fDigits = 0 ;
+ fReconParticles = 0x0;
fName="TOF";
- CreateTOFFolders();
+ fMerger = 0x0;
+ fTZero = kFALSE;
}
//_____________________________________________________________________________
-AliTOF::AliTOF(const char *name, const char *title)
+AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
: AliDetector(name,title)
{
//
//
// Initialization of hits, sdigits and digits array
- //
- fHits = new TClonesArray("AliTOFhit", 405);
+ // added option for time zero analysis
+ fFGeom = 0x0; //skowron
+ fDTask = 0x0;
+ fReTask= 0x0;
+ fReconParticles= 0x0;
+ fMerger = 0x0;
+
+ if (strstr(option,"tzero")){
+ fHits = new TClonesArray("AliTOFhitT0", 1000);
+ fTZero = kTRUE;
+ cout << "tzero option requires AliTOFv4T0 as TOF version (check Your Config.C)" << endl;
+ }else{
+ fHits = new TClonesArray("AliTOFhit", 1000);
+ fTZero = kFALSE;
+ }
gAlice->AddHitList(fHits);
fIshunt = 0;
+ fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+ fDigits = new TClonesArray("AliTOFdigit", 1000);
+ fNSDigits = 0;
- fSDigits = new TClonesArray("AliTOFdigit", 405);
-
- fDigits = new TClonesArray("AliTOFdigit", 405);
-
+ fFGeom = 0x0;
+ fDTask = 0x0;
+ fReTask = 0x0;
+ fReconParticles = 0x0;
+ fMerger = 0x0;
//
// Digitization parameters
fZlenC = 177.5;//cm length of module C
fZlenB = 141.0;//cm length of module B
fZlenA = 106.0;//cm length of module A
- fZtof = 370.5;//cm total semi-length of TOF detector
+ fZtof = 371.5;//cm total semi-length of TOF detector
// Strip Parameters
fStripLn = 122.0;//cm Strip Length
// (TARODA)
fNTdc = 32; // number of Tdc (Time to Digital Converter)
fNPadXRoc = (Int_t)fPadXSector/fNRoc; // number of pads for each ROC
-
- // Create TOF Folder Structure
- CreateTOFFolders();
+
}
//_____________________________________________________________________________
fReTask = new TTask(GetName(), tempo);
aliceRe->Add(fReTask) ;
- delete tempo ;
+ delete [] tempo ;
// creates the TOF geometry folder
geomF->AddFolder("TOF", "Geometry for TOF") ;
//_____________________________________________________________________________
AliTOF::~AliTOF()
{
- // remove the alice folder
+ // 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;
alice = 0;
+ */
+ if (fHits)
+ {
+ fHits->Delete ();
+ delete fHits;
+ fHits = 0;
+ }
+ if (fDigits)
+ {
+ fDigits->Delete ();
+ delete fDigits;
+ fDigits = 0;
+ }
+ if (fSDigits)
+ {
+ fSDigits->Delete();
+ delete fSDigits;
+ fSDigits = 0;
+ }
+ if (fReconParticles)
+ {
+ fReconParticles->Delete ();
+ delete fReconParticles;
+ fReconParticles = 0;
+ }
+
}
//_____________________________________________________________________________
TClonesArray &lhits = *fHits;
new(lhits[fNhits++]) AliTOFhit(fIshunt, track, vol, hits);
}
-
+
+//_____________________________________________________________________________
+void AliTOF::AddT0Hit(Int_t track, Int_t *vol, Float_t *hits)
+{
+ //
+ // Add a TOF hit
+ // new with placement used
+ //
+ TClonesArray &lhits = *fHits;
+ new(lhits[fNhits++]) AliTOFhitT0(fIshunt, track, vol, hits);
+}
+
//_____________________________________________________________________________
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)
+{
+
+//
+// Add a TOF sdigit
+//
+
+ TClonesArray &lSDigits = *fSDigits;
+ new(lSDigits[fNSDigits++]) AliTOFSDigit(tracknum, vol, digits);
+}
+
+//_____________________________________________________________________________
+void AliTOF::SetTreeAddress ()
+{
+ // Set branch address for the Hits and Digits Tree.
+ char branchname[30];
+
+ if (fLoader->TreeH())
+ {
+ if (fHits == 0x0)
+ {
+ if (fTZero) fHits = new TClonesArray("AliTOFhitT0", 1000);
+ else fHits = new TClonesArray("AliTOFhit", 1000);
+ }
+ }
+ 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 () )
+ {
+ branch = fLoader->TreeS ()->GetBranch ("TOF");
+ if (branch) {
+ if (fSDigits == 0x0) fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+ branch->SetAddress (&fSDigits);
+ }
+ }
+
+ if (fLoader->TreeR() && fReconParticles) //I do not know where this array is created - skowron
+ {
+ branch = fLoader->TreeR()->GetBranch("TOF");
+ if (branch)
+ {
+ branch->SetAddress(&fReconParticles) ;
+ }
+ }
+}
//_____________________________________________________________________________
void AliTOF::CreateGeometry()
{
//
// Defines TOF materials for all versions
- // Authors : Maxim Martemianov, Boris Zagreev (ITEP)
- // 18/09/98
- // Revision: F. Pierella 5-3-2001
- // Bologna University
+ // Revision: F. Pierella 18-VI-2002
//
+
Int_t isxfld = gAlice->Field()->Integ();
Float_t sxmgmx = gAlice->Field()->Max();
//
- //--- Quartz (SiO2)
+ //--- 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.20;
+ 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 wmatg10[4] = { .259,.288,.248,.205 };
Float_t densg10 = 1.7;
Int_t nlmatg10 = -4;
- // --- DME
- Float_t adme[5] = { 12.,1.,16.,19.,79. };
- Float_t zdme[5] = { 6.,1., 8., 9.,35. };
- Float_t wmatdme[5] = { .4056,.0961,.2562,.1014,.1407 };
- Float_t densdme = .00205;
- Int_t nlmatdme = 5;
+
+ // 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 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);
AliMaterial( 1, "Air$",14.61,7.3,0.001205,30423.24,67500.);
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, "DME ", adme, zdme, densdme, nlmatdme, wmatdme);
+ 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, "Quartz$", aq, zq, dq, nq, wq);
+ 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;
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, "DME$" , 6, 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(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);
}
//_____________________________________________________________________________
//
return 9999;
}
-
+
+//___________________________________________
+void AliTOF::ResetHits ()
+{
+ // Reset number of clusters and the cluster array for this detector
+ AliDetector::ResetHits ();
+}
+
+//____________________________________________
+void AliTOF::ResetDigits ()
+{
+ //
+ // Reset number of digits and the digits array for this detector
+ AliDetector::ResetDigits ();
+ //
+}
//_____________________________________________________________________________
void AliTOF::Init()
{
}
//____________________________________________________________________________
-void AliTOF::MakeBranch(Option_t* option, const char *file)
+void AliTOF::MakeBranch(Option_t* option)
{
//
// Initializes the Branches of the TOF inside the
// trees written for each event.
- // AliDetector::MakeBranch initializes just the
+ // AliDetector::MakeBranch initializes just the
// Branch inside TreeH. Here we add the branches in
- // TreeD and TreeS.
+ // TreeD, TreeS and TreeR.
//
- AliDetector::MakeBranch(option,file);
+ const char *oH = strstr(option,"H");
+ if (fLoader->TreeH() && oH)
+ {
+ if (fHits == 0x0)
+ {
+ if (fTZero) fHits = new TClonesArray("AliTOFhitT0", 1000);
+ else fHits = new TClonesArray("AliTOFhit", 1000);
+ }
+ }
+
+ AliDetector::MakeBranch(option);
Int_t buffersize = 4000;
Char_t branchname[10];
const char *oD = strstr(option,"D");
const char *oS = strstr(option,"S");
+ const char *oR = strstr(option,"R");
- if (oD)
- //
- // one branch for TOF digits
- //
-
-
- if (fDigits && gAlice->TreeD() && oD){
- MakeBranchInTree(gAlice->TreeD(),
- branchname, &fDigits,buffersize, file) ;
+ if (fLoader->TreeD() && oD){
+ if (fDigits == 0x0) fDigits = new TClonesArray("AliTOFdigit", 1000);
+ MakeBranchInTree(fLoader->TreeD(), branchname, &fDigits,buffersize, 0) ;
}
- if (oS)
- //
- // one branch for TOF sdigits
- //
-
-
- if (fSDigits && gAlice->TreeS() && oS){
- MakeBranchInTree(gAlice->TreeS(),
- branchname, &fSDigits,buffersize, file) ;
+ if (fLoader->TreeS() && oS){
+ if (fSDigits == 0x0) fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+ MakeBranchInTree(fLoader->TreeS(), branchname, &fSDigits,buffersize, 0) ;
}
+ if (fReconParticles && fLoader->TreeR() && oR){
+ MakeBranchInTree(fLoader->TreeR(), branchname, &fReconParticles,buffersize, 0) ;
+ }
}
//____________________________________________________________________________
void AliTOF::SDigits2Digits()
{
//
-// Generate digits
+// Generate digits performing merging
//
+ /*
int nparticles = gAlice->GetNtrack();
cout << "Particles :" <<nparticles<<endl;
if (nparticles > 0 ) {
+
AliTOF::Hits2Digits();
+
}
+ */
+ cout<<"AliTOF::SDigits2Digits"<<endl;
+ if (fMerger) {
+ fMerger->Init();
+ cout<<"AliTOF::SDigits2Digits Init"<<endl;
+ fMerger->Digitise();
+ cout<<"AliTOF::SDigits2Digits Digitise() "<<endl;
+ }
}
-//____________________________________________________________________________
-void AliTOF::Hits2Digits()
+//---------------------------------------------------------------------
+void AliTOF::SetMerger(AliTOFMerger* merger)
{
-//
-// Starting from the Hits Tree (TreeH), this
-// function writes the TOF Digits Branch in the Tree (TreeD) storing
-// the digits informations.
-// It has to be called just at the end of an event or
-// at the end of a whole run.
-// It could also be called by AliTOF::Finish Event()
-// Just for MC events.
-//
-// Called by the ROOT script Hits2Digits.C
-//
-// Simulation of detector response.
-
- Int_t ver = this->IsVersion();
- if(ver==0) return; // no digits for AliTOFv0
-
- Int_t nhits = 0; // total number of hits for the current track
- Int_t evNumber = 0; // evnumber
- Int_t tracks[3]; // track info
- Int_t vol[5]; // dummy location for digit
- Float_t digit[2]; // TOF digit variables
-
-
- // Get pointers to Alice detectors and Hits containers
- AliDetector* TOF = gAlice->GetDetector("TOF");
-
-
- TTree* tD = gAlice->TreeD();
-
- TTree* tH = gAlice->TreeH(); // pointer to the hits tree
- Stat_t ntracks = tH->GetEntries();
+// Set pointer to merger
+ fMerger = merger;
+}
- cout << "Total number of processed tracks in event " << gAlice->GetEvNumber() <<
- " :" << ntracks << endl;
+//---------------------------------------------------------------------
+AliTOFMerger* AliTOF::Merger()
+{
+// Return pointer to merger
+ return fMerger;
+}
- // do nothing if no tracked particles
- if( ntracks > 0){
+//---------------------------------------------------------------------
- // ptr to the current TOF hit
- AliTOFhit* tofHit;
+void AliTOF::Hits2SDigits()
+{
+//
+// Use the TOF SDigitizer to make TOF SDigits
+//
+//
+ //#ifdef DEBUG
+ cout<<"ALiTOF::Hits2SDigits> start...\n";
+ //#endif
- // Start loop on tracks in the hits containers
- // check for the total number of processed hits
- Int_t totnhits =0;
- Int_t totndigits =0;
+ //char * fileSDigits = 0 ;
+ char * fileHeader = 0;
+ AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader) ;
- if(TOF) {
+ sd->Exec("") ;
+ sd->Print("");
- for (Int_t track=0; track<ntracks;track++) {
+ delete sd ;
- // loop on all hits for the current track
-
- for(tofHit=(AliTOFhit*)TOF->FirstHit(track); tofHit; tofHit=(AliTOFhit*)TOF->NextHit()) {
- ++nhits;
- ++totnhits;
-
- vol[0] = tofHit->GetSector();
- vol[1] = tofHit->GetPlate();
- vol[2] = tofHit->GetPadx();
- vol[3] = tofHit->GetPadz();
- vol[4] = tofHit->GetStrip();
-
- // 95% of efficiency to be inserted here
- // edge effect to be inserted here
- // cross talk to be inserted here
-
- Float_t idealtime = tofHit->GetTof(); // unit s
- idealtime *= 1.E+12; // conversion from s to ps
- // fTimeRes is given usually in ps
- Float_t tdctime = gRandom->Gaus(idealtime, fTimeRes);
- digit[0] = tdctime;
-
- // typical Landau Distribution to be inserted here
- // instead of Gaussian Distribution
- Float_t idealcharge = tofHit->GetEdep();
- Float_t adccharge = gRandom->Gaus(idealcharge, fChrgRes);
- digit[1] = adccharge;
- Int_t tracknum = tofHit -> GetTrack();
- tracks[0] = tracknum;
- tracks[1] = 0;
- tracks[2] = 0;
-
- Bool_t overlap = CheckOverlap(vol, digit, tracknum);
- if(!overlap)
- AddDigit(tracks, vol, digit);
- ++totndigits;
- } // end loop on hits for the current track
-
- } // end loop on ntracks
-
- // some statistics concerning digitization
- cout << "Total number of processed TOF hits: " << totnhits << endl;
- cout << "Total number of created TOF digits: " << totndigits << endl;
-
- } // close if TOF switched ON
-
-} // close if( ntracks > 0)
-
-
-// fill and write the branch
-
- evNumber = gAlice->GetEvNumber();
- char hname[30];
- sprintf(hname,"TreeD%d",evNumber);
-
- tD->Fill();
-
- tD->Write(hname,TObject::kOverwrite);
-
- // reset tree
- gAlice->TreeD()->Reset();
}
-
//___________________________________________________________________________
Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
{
// Checks if 2 or more hits belong to the same pad.
// In this case the data assigned to the digit object
// are the ones of the first hit in order of Time.
-//
-// Called only by Hits2Digits.
+// 2 hits from the same track on the same pad are collected.
+// Called only by Hits2SDigits.
+// This procedure has to be optimized in the next TOF release.
//
- Bool_t overlap = 0;
+ Bool_t overlap = kFALSE;
Int_t vol2[5];
- for (Int_t ndig=0; ndig<fNdigits; ndig++){
- AliTOFdigit* currentDigit = (AliTOFdigit*)(fDigits->UncheckedAt(ndig));
+ for (Int_t ndig=0; ndig<fSDigits->GetEntries(); ndig++){
+ AliTOFdigit* currentDigit = (AliTOFdigit*)(fSDigits->UncheckedAt(ndig));
currentDigit->GetLocation(vol2);
- Bool_t idem=1;
+ Bool_t idem= kTRUE;
+ // check on digit volume
for (Int_t i=0;i<=4;i++){
- if (vol[i]!=vol2[i]) idem=0;}
- if (idem){
+ 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();
- if (tdc1>tdc2){
- currentDigit->SetTdc(tdc2);
- currentDigit->SetAdc(digit[1]);
- }
- currentDigit->AddTrack(Track);
- overlap = 1;
- }
- }
+
+ // 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;
}
tD->Write(0,TObject::kOverwrite);
}
+////////////////////////////////////////////////////////////////////////
+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);
+}
+////////////////////////////////////////////////////////////////////////
+void AliTOF::CreateSDigitsArray() {
+//
+// create TClonesArray fSDigits
+// needed for backward compatability with PPR test production
+//
+ fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff