X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSFDigitizer.cxx;h=e67e5ce1da3a6209ad3cdbc49dbb656eb6098295;hb=1fad94b43bd3348b6cd530161344385049abb595;hp=341cf68dde26516e519263b399b574f2f1d8b9dc;hpb=803d1ab0e2c9c9a8116c05954c3d3cdcf1f33759;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSFDigitizer.cxx b/ITS/AliITSFDigitizer.cxx
index 341cf68dde2..e67e5ce1da3 100644
--- a/ITS/AliITSFDigitizer.cxx
+++ b/ITS/AliITSFDigitizer.cxx
@@ -15,13 +15,14 @@
  
 /* $Id$ */
 
+//////////////////////////////////////////////////////////////////
+// Class for fast reconstruction of recpoints                   //
+//                                                              //
+//                                                              //
+//////////////////////////////////////////////////////////////////
+
 #include <stdlib.h>
-#include <Riostream.h>
-#include <TObjArray.h>
-#include <TClonesArray.h>
 #include <TTree.h>
-#include <TBranch.h>
-#include <TFile.h>
 
 #include <AliRun.h>
 #include <AliRunLoader.h>
@@ -29,29 +30,43 @@
 #include <AliRunDigitizer.h>
 
 #include "AliITSFDigitizer.h"
-// #include "AliITSpList.h"
-#include "AliITSmodule.h"
 #include "AliITSgeom.h"
 #include "AliITSsimulationFastPoints.h"
 
 ClassImp(AliITSFDigitizer)
 
 //______________________________________________________________________
-AliITSFDigitizer::AliITSFDigitizer() : AliDigitizer(){
+AliITSFDigitizer::AliITSFDigitizer() : AliDigitizer(),
+fITS(0),
+fInit(kFALSE){
 //
 // Default constructor.
 //
-    fITS      = 0;
-    fInit     = kFALSE;
 }
 //______________________________________________________________________
-AliITSFDigitizer::AliITSFDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr){
+AliITSFDigitizer::AliITSFDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr),
+fITS(0),
+fInit(kFALSE){
 //
 // Standard constructor.
 //
-    fITS      = 0;
-    fInit     = kFALSE;
 }
+//______________________________________________________________________
+AliITSFDigitizer::AliITSFDigitizer(const AliITSFDigitizer &rec):AliDigitizer(rec),
+fITS(rec.fITS),
+fInit(rec.fInit){
+    // Copy constructor. 
+  
+}
+//______________________________________________________________________
+AliITSFDigitizer& AliITSFDigitizer::operator=(const AliITSFDigitizer& /*source*/){
+
+    // Assignment operator. This is a function which is not allowed to be
+    // done.
+    Error("operator=","Assignment operator not allowed\n");
+    return *this; 
+}
+
 //______________________________________________________________________
 AliITSFDigitizer::~AliITSFDigitizer(){
 //
@@ -95,67 +110,64 @@ void AliITSFDigitizer::Exec(Option_t* opt){
 //      Option_t * opt  "deb" ... more verbose output 
 //
 
-  AliITSsimulationFastPoints *sim = new AliITSsimulationFastPoints();
-  AliRunLoader* outrl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
-  if (outrl == 0x0)
-   {
-     Error("Exec","Can not find Run Loader in output folder.");
-     return;
-   }
-
-  AliLoader* outgime = outrl->GetLoader("ITSLoader");
-  if (outgime == 0x0)
-   {
-     Error("Exec","Can not get TOF Loader from Output Run Loader.");
-     return;
-   }
-
-  TTree* outputTreeR = outgime->TreeR();
-  if (outputTreeR == 0x0)
-   {
-     outgime->MakeTree("R");
-     outputTreeR = outgime->TreeR();
-   }
-
-  TClonesArray *recPoints = fITS->RecPoints();
-//  TBranch *branch =
-  fITS->MakeBranchInTree(outputTreeR,"ITSRecPointsF",&recPoints,4000,0);
-  
-  Int_t nModules;
-  fITS->InitModules(-1,nModules);
+    AliITSsimulationFastPoints *sim = new AliITSsimulationFastPoints();
+    AliRunLoader* outrl = AliRunLoader::GetRunLoader(
+                                        fManager->GetOutputFolderName());
+    if (outrl == 0x0){
+	Error("Exec","Can not find Run Loader in output folder.");
+	return;
+    }
+    AliLoader* outgime = outrl->GetLoader("ITSLoader");
+    if (outgime == 0x0){
+	Error("Exec","Can not get TOF Loader from Output Run Loader.");
+	return;
+    }
+    if(strstr(opt,"deb")){
+	Info("Exec","sim=%p, outrl=%p, outgime=%p",sim,outrl,outgime);
+    }
+    TTree* outputTreeR = outgime->TreeR();
+    if (outputTreeR == 0x0){
+	outgime->MakeTree("R");
+	outputTreeR = outgime->TreeR();
+    }
+    
+    TClonesArray* recPoints = new TClonesArray("AliITSRecPoint",1000);
+    TBranch* branch = outputTreeR->GetBranch("ITSRecPointsF");
+    if(branch) branch->SetAddress(recPoints);
+    else outputTreeR->Branch("ITSRecPointsF",&recPoints);
+    Int_t nModules;
+    fITS->InitModules(-1,nModules);
 
 // load hits into modules
-  for (Int_t iFile = 0; iFile < fManager->GetNinputs(); iFile++) 
-   {
-     AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iFile));
-     if (rl == 0x0)
-      {
-        Error("Exec","Can not find Run Loader in input %d folder.",iFile);
-        return;
-      }
+    for (Int_t iFile = 0; iFile < fManager->GetNinputs(); iFile++){
+	AliRunLoader* rl = AliRunLoader::GetRunLoader(
+                                       fManager->GetInputFolderName(iFile));
+	if (rl == 0x0){
+	    Error("Exec","Can not find Run Loader in input %d folder.",iFile);
+	    return;
+	}
 
-     AliLoader* gime = rl->GetLoader("ITSLoader");
-     if (gime == 0x0)
-      {
-        Error("Exec","Can not get TOF Loader from Input %d Run Loader.",iFile);
-        return;
-      }
+	AliLoader* gime = rl->GetLoader("ITSLoader");
+	if (gime == 0x0){
+	    Error("Exec","Can not get TOF Loader from Input %d Run Loader.",
+		  iFile);
+	    return;
+	}
 
-     gime->LoadHits();
-     fITS->FillModules(gime->TreeH(),fManager->GetMask(iFile));
-     gime->UnloadHits();
-   }
+	gime->LoadHits();
+	fITS->FillModules(gime->TreeH(),fManager->GetMask(iFile));
+	gime->UnloadHits();
+    }
   
 // transform hits to fast rec points
 
-  AliITSgeom *geom = fITS->GetITSgeom();
-  for(Int_t moduleIndex = 0; moduleIndex < geom->GetIndexMax(); moduleIndex++){
-    sim->CreateFastRecPoints(moduleIndex);
-//    branch->Fill();
-    outputTreeR->Fill();
-    fITS->ResetRecPoints();
-  }
-  outrl->WriteRecPoints("OVERWRITE");
+    AliITSgeom *geom = fITS->GetITSgeom();
+    for(Int_t moduleIndex = 0; moduleIndex<geom->GetIndexMax(); moduleIndex++){
+	sim->CreateFastRecPoints(moduleIndex,recPoints);
+	outputTreeR->Fill();
+	recPoints->Clear();
+    }
+    outrl->WriteRecPoints("OVERWRITE");
 //  outputTreeR->AutoSave();
 }
 ////////////////////////////////////////////////////////////////////////