Updated SDigitizer

diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx
index 2f5471f4cf8d568823372d661b4fd051fb5c822c..bb9d23eab5ce214bbc60b473d963f0b61b3288dc 100644 (file)
--- a/TOF/AliTOF.cxx
+++ b/TOF/AliTOF.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.35  2002/03/21 13:52:53  vicinanz
+Minor changes to AliTOF constructor
+
 Revision 1.34  2002/02/20 13:41:38  hristov
 Default arguments set only in the header file
 
@@ -788,9 +791,9 @@ void AliTOF::Hits2SDigits()
   cout<<"ALiTOF::Hits2SDigits> start...\n";
   //#endif
   
-  char * fileSDigits = 0 ;
+  //char * fileSDigits = 0 ;
   char * fileHeader = 0;
-  AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader,fileSDigits) ;
+  AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader) ;
 
   sd->Exec("") ;
   sd->Print("");

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index 38d3788a56a2cc0d7c06293ccf3f6f869f3e977a..7bc9fdc5f9039fa780571ed508c339c0e7d477c1 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -27,9 +27,15 @@
 #include "TTask.h"
 #include "TTree.h"
 #include "TSystem.h"
-#include "TFile.h"
 #include "TParticle.h"
 #include "TH1.h"
+#include "TFile.h"
+#include "TROOT.h"
+#include "TFolder.h"
+#include <TF1.h>
+#include <stdlib.h>
+#include <iostream.h>
+#include <fstream.h>
 
 #include "AliTOFHitMap.h"
 #include "AliTOFSDigit.h"
@@ -45,16 +51,6 @@
 #include "AliDetector.h"
 #include "AliMC.h"
 
-#include "TFile.h"
-#include "TTask.h"
-#include "TTree.h"
-#include "TSystem.h"
-#include "TROOT.h"
-#include "TFolder.h"
-#include <TF1.h>
-#include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
 
 ClassImp(AliTOFSDigitizer)
 
@@ -62,22 +58,19 @@ ClassImp(AliTOFSDigitizer)
   AliTOFSDigitizer::AliTOFSDigitizer():TTask("AliTOFSDigitizer","") 
 {
   // ctor
-  fSDigits = 0 ;
   fEvent1=0;
   fEvent2=0;
   ftail    = 0;
 }
            
 //____________________________________________________________________________ 
-  AliTOFSDigitizer::AliTOFSDigitizer(char* HeaderFile,char *SdigitsFile, Int_t evNumber1, Int_t nEvents):TTask("AliTOFSDigitizer","") 
+  AliTOFSDigitizer::AliTOFSDigitizer(char* HeaderFile, Int_t evNumber1, Int_t nEvents):TTask("AliTOFSDigitizer","") 
 {
   fEvent1=evNumber1;
   fEvent2=fEvent1+nEvents;
-  fSDigits = 0;
   ftail    = 0;
 
   fHeadersFile = HeaderFile ; // input filename (with hits)
-  fSDigitsFile = SdigitsFile; // output filename for sdigits
   TFile * file = (TFile*) gROOT->GetFile(fHeadersFile.Data() ) ;
 
   //File was not opened yet
@@ -99,11 +92,6 @@ ClassImp(AliTOFSDigitizer)
   AliTOFSDigitizer::~AliTOFSDigitizer()
 {
   // dtor
-  if (ftail)
-    {
-      delete ftail;
-      ftail = 0;
-    }
 }
 
 //____________________________________________________________________________ 
@@ -227,6 +215,10 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption, Option_t *allEvents) {
     // create hit map
     AliTOFHitMap *hitMap = new AliTOFHitMap(TOF->SDigits());
 
+    // decrease required CPU time
+    TH->SetBranchStatus("*",0); // switch off all branches
+    TH->SetBranchStatus("TOF*",1); // switch on only TOF
+
     Int_t ntracks = static_cast<Int_t>(TH->GetEntries());
     for (Int_t track = 0; track < ntracks; track++)
     {
@@ -392,23 +384,12 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption, Option_t *allEvents) {
 
   Print("");
 }
- 
-//__________________________________________________________________
-void AliTOFSDigitizer::SetSDigitsFile(char * file ){
-  if(!fSDigitsFile.IsNull())
-    cout << "Changing SDigits file from " <<(char *)fSDigitsFile.Data() << " to " << file << endl ;
-  fSDigitsFile=file ;
-}
 
 //__________________________________________________________________
 void AliTOFSDigitizer::Print(Option_t* opt)const
 {
   cout << "------------------- "<< GetName() << " -------------" << endl ;
-  if(fSDigitsFile.IsNull())
-    cout << " Writing SDigits to file with hits "<< endl ;
-  else
-    cout << "    Writing SDigits to file  " << (char*) fSDigitsFile.Data() << endl ;
-  cout << "--------------------------------------------------" << endl;
+
 }
 
 //__________________________________________________________________

diff --git a/TOF/AliTOFSDigitizer.h b/TOF/AliTOFSDigitizer.h
index 143a4152f8af88ccf62924c88dff6e82deb49e73..a9ca6d5f3b20ddff5dbadf08d6b39aa13830008a 100644 (file)
--- a/TOF/AliTOFSDigitizer.h
+++ b/TOF/AliTOFSDigitizer.h
@@ -21,18 +21,16 @@ class AliTOFSDigitizer: public TTask {
 
 public:
   AliTOFSDigitizer() ;          // ctor
-  AliTOFSDigitizer(char* HeaderFile, char *SdigitsFile = 0, Int_t evNumber1=0, Int_t nEvents=1) ; // par ctor
+  AliTOFSDigitizer(char* HeaderFile, Int_t evNumber1=0, Int_t nEvents=1) ; // par ctor
 
   virtual ~AliTOFSDigitizer() ; // dtor
- 
-  const char *GetSDigitsFile() const {return fSDigitsFile.Data();}  
+
   virtual void  Exec(Option_t *verboseOption, Option_t *allEvents="noAll"); 
   void SetSDigitsFile(char * file ) ;
   void InitParameters();
   virtual void PrintParameters() const ;
   virtual void  SimulateDetectorResponse(Float_t z0, Float_t x0, Float_t geantTime, Int_t& nActivatedPads, Int_t& nFiredPads, Bool_t* isFired, Int_t* nPlace, Float_t* qInduced, Float_t* tofTime, Float_t& averageTime);
   virtual void Print(Option_t* opt) const ;
-  TClonesArray *SDigits() const {return fSDigits;}
   void  SetFirstEvent(Int_t event1)      {fEvent1=event1;}
   void  SetSecondEvent(Int_t event2)     {fEvent2=event2;}
   Int_t GetFirstEvent()  const {return fEvent1;}
@@ -106,8 +104,6 @@ public:
 private:
   Int_t   fEvent1;          // lower bound for events to sdigitize
   Int_t   fEvent2;          // upper bound for events to sdigitize
-  TString fSDigitsFile;     // output file 
-  TClonesArray *fSDigits;   //! array of summable digits
   TF1     *ftail;           // pointer to formula for time with tail
   TString fHeadersFile;     // input file