Removing the fake copy constructors and assignment operator, moving their declaration...

[u/mrichter/AliRoot.git] / TOF / AliTOF.cxx

diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx
index 741d01693fb6b52c39efbca6273f7bcd7414d040..164de8abc127d5755a13826052c1319f3d688c5d 100644 (file)
--- a/TOF/AliTOF.cxx
+++ b/TOF/AliTOF.cxx
@@ -39,68 +39,73 @@
 */
 //End_Html
 
+#include "TFile.h"
+#include "TFolder.h"
+#include "TROOT.h"
+#include "TTask.h"
+#include "TTree.h"
+#include "TVirtualMC.h"
 
-
-#include <Riostream.h>
-#include <Rstrstream.h>
-#include <stdlib.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 <TDirectory.h>
-
-#include "AliLog.h"
-#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 "AliTOFGeometryV4.h"
-#include "AliTOFGeometryV5.h"
-#include "AliTOFSDigit.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 "AliTOFcluster.h"
+#include "AliTOFhit.h"
+#include "AliTOFGeometry.h"
+#include "AliTOFSDigitizer.h"
+#include "AliTOFSDigit.h"
+#include "AliTOF.h"
+
+class AliTOFcluster;
+
+extern TFile *gFile;
+extern TROOT *gROOT;
+extern TVirtualMC *gMC;
+
+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
@@ -110,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;
@@ -127,28 +129,25 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
   if (gAlice==0) {
      AliFatal("gAlice==0 !");
   }
-  if (gAlice->GetMCApp()->GetHitLists())
-     gAlice->GetMCApp()->AddHitList(fHits);
+
+  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;
 
   //
   // 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
@@ -160,9 +159,36 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
 
 }
 
+//____________________________________________________________________________
+void AliTOF::SetTOFSectors(Int_t *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];
+  }
+}
 //_____________________________________________________________________________
 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
 
@@ -435,7 +461,7 @@ void AliTOF::DrawModule() const
 }
 
 //_____________________________________________________________________________
-Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t ) const
+Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t )
 {
   //
   // Returns distance from mouse pointer to detector, default version
@@ -565,7 +591,7 @@ void AliTOF::Hits2SDigits()
 // Use the TOF SDigitizer to make TOF SDigits
 //
 
-//  cout<<"AliTOF::Hits2SDigits> start...\n";
+//  AliInfo("Start...");
   
   AliRunLoader * rl = fLoader->GetRunLoader();
   AliTOFSDigitizer sd((rl->GetFileName()).Data());
@@ -681,7 +707,7 @@ void AliTOF::Digits2Raw()
   //AliTOFDDLRawData rawWriter;
   rawWriter.SetVerbose(0);
   
-  AliInfo("Formatting raw data for TOF");
+  AliDebug(1,"Formatting raw data for TOF");
   digits->GetEvent(0);
   rawWriter.RawDataTOF(digits->GetBranch("TOF"));