///////////////////////////////////////////////////////////////////////////////
#include <TBrowser.h>
+#include <TClonesArray.h>
#include <TTree.h>
+#include "AliLog.h"
#include "AliConfig.h"
#include "AliDetector.h"
#include "AliHit.h"
//_______________________________________________________________________
AliDetector::AliDetector():
+ AliModule(),
fTimeGate(200.e-9),
fIshunt(0),
fNhits(0),
fNdigits(0),
fBufferSize(1600),
+ fMaxIterHit(0),
+ fCurIterHit(0),
fHits(0),
fDigits(0),
fPoints(0),
//
}
-//_______________________________________________________________________
-AliDetector::AliDetector(const AliDetector &det):
- AliModule(det),
- fTimeGate(200.e-9),
- fIshunt(0),
- fNhits(0),
- fNdigits(0),
- fBufferSize(1600),
- fHits(0),
- fDigits(0),
- fPoints(0),
- fLoader(0x0)
-{
- det.Copy(*this);
-}
-
//_____________________________________________________________________________
AliDetector::AliDetector(const char* name,const char *title):
AliModule(name,title),
fNhits(0),
fNdigits(0),
fBufferSize(1600),
+ fMaxIterHit(0),
+ fCurIterHit(0),
fHits(0),
fDigits(0),
fPoints(0),
MayNotUse("Publish");
}
+//_______________________________________________________________________
+void AliDetector::AddAlignableVolumes() const
+{
+ //
+ AliWarning(Form("%s still has to implement the AddAlignableVolumes method!",GetName()));
+}
+
//_______________________________________________________________________
TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name,
void* address, Int_t size,
//
//
//
-// if (GetDebug()>1)
- if(GetDebug()) Info("MakeBranch","Making Branch %s",name);
+
+ AliDebug(2,Form("Making Branch %s",name));
if (tree == 0x0)
{
- Error("MakeBranch","Making Branch %s Tree is NULL",name);
+ AliError(Form("Making Branch %s Tree is NULL",name));
return 0x0;
}
TBranch *branch = tree->GetBranch(name);
if (branch)
{
- if(GetDebug()) Info("MakeBranch","Branch %s is already in tree.",name);
+ AliDebug(2,Form("Branch %s is already in tree.",name));
return branch;
}
}
else
{
- branch = tree->Branch(name,address,size);
+ branch = tree->Bronch(name, "TClonesArray", address, size, splitlevel);
}
- if(GetDebug()) Info("MakeBranch","Branch %s returning branch %#x",name,branch);
+ AliDebug(2,Form("Branch %s returning branch %#x",name,branch));
return branch;
}
}
}
-//_______________________________________________________________________
-void AliDetector::Copy(TObject &) const
-{
- //
- // Copy *this onto det -- not implemented
- //
- Fatal("Copy","Not implemented\n");
-}
-
//_______________________________________________________________________
void AliDetector::FinishRun()
{
else
return 0;
} else {
- printf("* AliDetector::NextHit * Hit Iterator called without calling FistHit before\n");
+ AliWarning("Hit Iterator called without calling FistHit before");
return 0;
}
}
//
if (fHits == 0)
{
- Error("LoadPoints","fHits == 0. Name is %s",GetName());
+ AliError(Form("fHits == 0. Name is %s",GetName()));
return;
}
//
for (Int_t hit=0;hit<nhits;hit++) {
ahit = dynamic_cast<AliHit*>(fHits->UncheckedAt(hit));
trk=ahit->GetTrack();
- if(trk>tracks) Fatal("LoadPoints","Found track number %d, max track %d\n",trk, tracks);
+ if(trk>tracks) {
+ AliError(Form("Found track number %d, max track %d",trk, tracks));
+ continue;
+ }
if(ntrk[trk]==limi[trk])
{
//
for(trk=0; trk<tracks; ++trk) {
if(ntrk[trk]) {
points = new AliPoints();
- points->SetMarkerColor(GetMarkerColor());
- points->SetMarkerSize(GetMarkerSize());
+ points->SetMarkerColor(3); //PH color=3 was set in AliModule
+ points->SetMarkerSize(1); //PH size-1 is the default value
points->SetDetector(this);
points->SetParticle(trk);
- points->SetPolyMarker(ntrk[trk],coor[trk],GetMarkerStyle());
+ points->SetPolyMarker(ntrk[trk],coor[trk],1);//PH style=1 is the default value
fPoints->AddAt(points,trk);
delete [] coor[trk];
coor[trk]=0;
// Create a new branch for this detector in its treeH
//
- if(GetDebug()) Info("MakeBranch"," for %s",GetName());
+ AliDebug(2,Form(" for %s",GetName()));
const char *cH = strstr(option,"H");
if (fHits && TreeH() && cH)
branch = tree->GetBranch(GetName());
if (branch)
{
- if(GetDebug()) Info("SetTreeAddress","(%s) Setting for Hits",GetName());
+ AliDebug(2,Form("(%s) Setting for Hits",GetName()));
branch->SetAddress(&fHits);
}
else
{ //can be invoked before branch creation
- if(GetDebug()) Warning("SetTreeAddress","(%s) Failed for Hits. Can not find branch in tree.",GetName());
+ AliDebug(2,Form("(%s) Failed for Hits. Can not find branch in tree.",GetName()));
}
}
branch = treeD->GetBranch(GetName());
if (branch) branch->SetAddress(&fDigits);
}
-
- AliModule::SetTreeAddress();
}
//_______________________________________________________________________
AliLoader* loader = GetLoader();
if (loader == 0x0)
{
- Error("MakeTree","Can not get loader for %s",GetName());
+ AliError(Form("Can not get loader for %s",GetName()));
return;
}
loader->MakeTree(option); //delegate this job to getter
//builds standard getter (AliLoader type)
//if detector wants to use castomized getter, it must overload this method
- if (GetDebug())
- Info("MakeLoader",
- "Creating standard getter for detector %s. Top folder is %s.",
- GetName(),topfoldername);
+ AliDebug(1,Form("Creating standard getter for detector %s. Top folder is %s.",
+ GetName(),topfoldername));
fLoader = new AliLoader(GetName(),topfoldername);
return fLoader;
if (GetLoader() == 0x0)
{
//sunstitude this with make getter when we can obtain the event folder name
- Error("TreeH","Can not get the getter");
+ AliError("Can not get the getter");
return 0x0;
}