Skip to content

Commit

Permalink
This commit was manufactured by cvs2svn to create tag 'v4-07-02'.
Browse files Browse the repository at this point in the history
  • Loading branch information
(no author) committed Oct 10, 2007
1 parent 9fae464 commit 907dfe6
Show file tree
Hide file tree
Showing 121 changed files with 1,440 additions and 2,933 deletions.
6 changes: 3 additions & 3 deletions EMCAL/AliEMCALClusterizerv1.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void AliEMCALClusterizerv1::Digits2Clusters(Option_t * option)

//Evaluate position, dispersion and other RecPoint properties for EC section
for(index = 0; index < fRecPoints->GetEntries(); index++) {
if (dynamic_cast<AliEMCALRecPoint *>(fRecPoints->At(index))->GetClusterType() != AliESDCaloCluster::kEMCALPseudoCluster)
if (dynamic_cast<AliEMCALRecPoint *>(fRecPoints->At(index))->GetClusterType() != AliESDCaloCluster::kPseudoCluster)
dynamic_cast<AliEMCALRecPoint *>(fRecPoints->At(index))->EvalAll(fECAW0,fDigitsArr) ;
}

Expand Down Expand Up @@ -496,7 +496,7 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
nSM = fGeom->GetSuperModuleNumber(digit->GetId());
if(recPoints[nSM] == 0) {
recPoints[nSM] = new AliEMCALRecPoint(Form("PC%2.2i", nSM));
recPoints[nSM]->SetClusterType(AliESDCaloCluster::kEMCALPseudoCluster);
recPoints[nSM]->SetClusterType(AliESDCaloCluster::kPseudoCluster);
}
recPoints[nSM]->AddDigit(*digit, Calibrate(digit->GetAmp(), digit->GetId()));
}
Expand Down Expand Up @@ -540,7 +540,7 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
recPoint = dynamic_cast<AliEMCALRecPoint *>(fRecPoints->At(fNumberOfECAClusters)) ;
fNumberOfECAClusters++ ;

recPoint->SetClusterType(AliESDCaloCluster::kEMCALClusterv1);
recPoint->SetClusterType(AliESDCaloCluster::kClusterv1);

recPoint->AddDigit(*digit, Calibrate(digit->GetAmp(), digit->GetId())) ;
TObjArray clusterDigits;
Expand Down
2 changes: 1 addition & 1 deletion EMCAL/AliEMCALFolder.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ TList *l, Double_t deff, Double_t w0, Double_t phiSlope)
// const UShort_t* dgAmp = cl->GetDigitAmplitude(); // This is energy - bad definition

rp = new AliEMCALRecPoint(""); // opt=""
rp->SetClusterType(AliESDCaloCluster::kEMCALClusterv1);
rp->SetClusterType(AliESDCaloCluster::kClusterv1);
AliEMCALDigit* dg=0;
TClonesArray digits("AliEMCALDigit", ndg);
Int_t absId = 0;
Expand Down
5 changes: 1 addition & 4 deletions EMCAL/AliEMCALPID.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
/* History of cvs commits:
*
* $Log$
* Revision 1.14 2007/07/26 16:54:53 morsch
* Changes in AliESDEvent fwd declarartions.
*
* Revision 1.13 2007/07/11 13:43:29 hristov
* New class AliESDEvent, backward compatibility with the old AliESD (Christian)
*
Expand Down Expand Up @@ -265,7 +262,7 @@ void AliEMCALPID::RunPID(AliESDEvent *esd)
lambda0 = clust->GetM02();
// verify cluster type
Int_t clusterType= clust->GetClusterType();
if (clusterType == AliESDCaloCluster::kEMCALClusterv1 && lambda0 != 0 && energy < 1000) {
if (clusterType == AliESDCaloCluster::kClusterv1 && lambda0 != 0 && energy < 1000) {


// reject clusters with lambda0 = 0
Expand Down
11 changes: 4 additions & 7 deletions EMCAL/AliEMCALRecPointsQaESDSelector.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
* provided "as is" without express or implied warranty. *
**************************************************************************/

/* $Log$
/* Revision 1.2 2007/09/11 19:38:15 pavlinov
/* added pi0 calibration, linearity, shower profile
/*co: warning: `/* $Log' is obsolescent; use ` * $Log'.
/* $Log$co: warning: `/* $Log' is obsolescent; use ` * $Log'.
* Revision 1.1 2007/08/08 15:58:01 hristov
* New calibration classes. (Aleksei)
* */
Expand Down Expand Up @@ -316,10 +313,10 @@ Bool_t AliEMCALRecPointsQaESDSelector::Process(Long64_t entry)
static Double_t erec=0., ecorr=0.0;
for(int i=indOfFirstEmcalRP; i<indOfFirstEmcalRP+nEmcalClusters; i++) {
cl = fESD->GetCaloCluster(i);
if(cl->GetClusterType() == AliESDCaloCluster::kEMCALPseudoCluster) {
if(cl->GetClusterType() == AliESDCaloCluster::kPseudoCluster) {
nEmcalPseudoClusters++;
l = fLofHistsPC;
} else if(cl->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1){
} else if(cl->GetClusterType() == AliESDCaloCluster::kClusterv1){
nEmcalRP++;
if(fEMCAL->GetIterationNumber()>1||GetKeyOptsValue(kIDEAL)||GetKeyOptsValue(kRECALIB)||GetKeyOptsValue(kFIT)) {
AliEMCALRecPoint *rp=0;
Expand Down Expand Up @@ -390,7 +387,7 @@ Bool_t AliEMCALRecPointsQaESDSelector::Process(Long64_t entry)
for(int id=0; id<cl->GetNumberOfDigits(); id++) {
eDigi = double(digiAmpl[id]) / 500.; // See AliEMCALClusterizerv1
// if(eDigi <= 0.0) { // sometimes it is happen
//if(eDigi > 10.0 && cl->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1) {
//if(eDigi > 10.0 && cl->GetClusterType() == AliESDCaloCluster::kClusterv1) {
// printf(" %i digiAmpl %i : %f \n", id, int(digiAmpl[id]), eDigi);
//}
u::FillH1(l, 5, eDigi);
Expand Down
7 changes: 4 additions & 3 deletions EMCAL/AliEMCALReconstructor.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,

for (Int_t iClust = 0 ; iClust < nClusters ; iClust++) {
const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)clusters->At(iClust);
//if(clust->GetClusterType()== AliESDCaloCluster::kEMCALClusterv1) nRP++; else nPC++;
//if(clust->GetClusterType()== AliESDCaloCluster::kClusterv1) nRP++; else nPC++;
if (Debug()) clust->Print();
// Get information from EMCAL reconstruction points
Float_t xyz[3];
Expand Down Expand Up @@ -241,7 +241,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
digiList[newdigitMult] = (UShort_t)(digitInts[iDigit]);
newdigitMult++;
}
else if (clust->GetClusterType() != AliESDCaloCluster::kEMCALPseudoCluster)
else if (clust->GetClusterType() != AliESDCaloCluster::kPseudoCluster)
Warning("FillESD()","Negative or 0 digit amplitude in cluster");
}

Expand Down Expand Up @@ -276,6 +276,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,

// fills the ESDCaloCluster
AliESDCaloCluster * ec = new AliESDCaloCluster() ;
ec->SetEMCAL(kTRUE);
ec->SetClusterType(clust->GetClusterType());
ec->SetPosition(xyz);
ec->SetE(clust->GetEnergy());
Expand All @@ -286,7 +287,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
ec->AddDigitTime(arrayTimeList);
ec->AddDigitIndex(arrayIndexList);

if(clust->GetClusterType()== AliESDCaloCluster::kEMCALClusterv1){
if(clust->GetClusterType()== AliESDCaloCluster::kClusterv1){

ec->SetClusterDisp(clust->GetDispersion());
ec->SetClusterChi2(-1); //not yet implemented
Expand Down
4 changes: 2 additions & 2 deletions EMCAL/AliEMCALTracker.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Int_t AliEMCALTracker::LoadClusters(TTree *cTree)
for (Int_t i = 0; i < nClusters; i++) {
AliEMCALRecPoint *cluster = (AliEMCALRecPoint*)clusters->At(i);
if (!cluster) continue;
if (cluster->GetClusterType() != AliESDCaloCluster::kEMCALClusterv1) continue;
if (cluster->GetClusterType() != AliESDCaloCluster::kClusterv1) continue;
AliEMCALMatchCluster *matchCluster = new AliEMCALMatchCluster(i, cluster);
fClusters->AddLast(matchCluster);
}
Expand Down Expand Up @@ -272,7 +272,7 @@ Int_t AliEMCALTracker::LoadClusters(AliESDEvent *esd)
for (i = start; i < end; i++) {
AliESDCaloCluster *cluster = esd->GetCaloCluster(i);
if (!cluster) continue;
if (cluster->GetClusterType() != AliESDCaloCluster::kEMCALClusterv1) continue;
if (cluster->GetClusterType() != AliESDCaloCluster::kClusterv1) continue;
AliEMCALMatchCluster *matchCluster = new AliEMCALMatchCluster(i, cluster);
fClusters->AddLast(matchCluster);
}
Expand Down
2 changes: 1 addition & 1 deletion ESDCheck/AliEMCALQATask.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void AliEMCALQATask::Exec(Option_t *)
AliESDCaloCluster * caloCluster = fESD->GetCaloCluster(emcalCluster) ;
if (caloCluster) {
Float_t pos[3] ;
if(caloCluster->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1) {
if(caloCluster->GetClusterType() == AliESDCaloCluster::kClusterv1) {
caloCluster->GetPosition(pos) ;
fhEMCALPos->Fill(pos[0],pos[1],pos[2]) ;
fhEMCALEnergy->Fill(caloCluster->E()) ;
Expand Down
2 changes: 1 addition & 1 deletion ESDCheck/AliPHOSQATask.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void AliPHOSQATask::Exec(Option_t *)
fhPHOSPos->Fill( pos[0], pos[1], pos[2] ) ;
fhPHOSDigits->Fill(entry, caloCluster->GetNumberOfDigits() ) ;
numberOfDigitsInPhos += caloCluster->GetNumberOfDigits() ;
Double_t * pid = caloCluster->GetPid() ;
Float_t * pid = caloCluster->GetPid() ;
if(pid[AliPID::kPhoton] > 0.9) {
phosVector[numberOfPhotonsInPhos] = new TVector3(pos[0],pos[1],pos[2]) ;
phosPhotonsEnergy[numberOfPhotonsInPhos]=caloCluster->E() ;
Expand Down
12 changes: 6 additions & 6 deletions EVE/alice-macros/geom_acorde.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ void geom_acorde()
{
using namespace std;

gGeoManager = gReve->GetGeometry("geometry.root");

Reve::RenderElementList* list = new Reve::RenderElementList("ACORDE");
// gGeoManager = gReve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
Reve::RenderElementList* list = new Reve::RenderElementList("ACORDE1_");
gReve->AddGlobalRenderElement(list);

for(Int_t i=1; i<61; ++i) {

for(Int_t i=1; i<60; ++i){
char form[10000];
sprintf(form, "ACORDE1_%d", i);
TGeoNode* node = gGeoManager->GetTopVolume()->FindNode(form);
Reve::GeoTopNodeRnrEl* re = new Reve::GeoTopNodeRnrEl(gGeoManager, node);
re->UseNodeTrans();
gReve->AddGlobalRenderElement(list, re);
// gReve->AddGlobalRenderElement(re, list); // For EVE-dev
}

gReve->Redraw3D();
gReve->Redraw3D();

}
43 changes: 16 additions & 27 deletions FMD/AliFMDInput.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,23 +396,19 @@ AliFMDInput::ProcessHits()
AliError("No hit tree defined");
return kFALSE;
}
if (!fArrayH) {
AliError("No hit array defined");
return kFALSE;
}

Int_t nTracks = fTreeH->GetEntries();
for (Int_t i = 0; i < nTracks; i++) {
Int_t hitRead = fTreeH->GetEntry(i);
if (hitRead <= 0) continue;

if (!fArrayH) {
AliError("No hit array defined");
return kFALSE;
}
Int_t nHit = fArrayH->GetEntries();
if (nHit <= 0) continue;

for (Int_t j = 0; j < nHit; j++) {
AliFMDHit* hit = static_cast<AliFMDHit*>(fArrayH->At(j));
if (!hit) continue;

TParticle* track = 0;
if (TESTBIT(fTreeMask, kKinematics) && fStack) {
Int_t trackno = hit->Track();
Expand All @@ -429,7 +425,7 @@ Bool_t
AliFMDInput::ProcessTracks()
{
// Read the hit tree, and pass each hit to the member function
// ProcessTrack.
// ProcessHit.
if (!fStack) {
AliError("No track tree defined");
return kFALSE;
Expand All @@ -438,32 +434,25 @@ AliFMDInput::ProcessTracks()
AliError("No hit tree defined");
return kFALSE;
}
if (!fArrayH) {
AliError("No hit array defined");
return kFALSE;
}

// Int_t nTracks = fStack->GetNtrack();
Int_t nTracks = fTreeH->GetEntries();
for (Int_t i = 0; i < nTracks; i++) {
Int_t trackno = nTracks - i - 1;
TParticle* track = fStack->Particle(trackno);
TParticle* track = fStack->Particle(i);
if (!track) continue;

// Get the hits for this track.
Int_t hitRead = fTreeH->GetEntry(i);
Int_t nHit = fArrayH->GetEntries();
if (nHit == 0 || hitRead <= 0) {
// Let user code see the track, even if there's no hits.
if (!ProcessTrack(trackno, track, 0)) return kFALSE;
continue;
if (hitRead <= 0) continue;
if (!fArrayH) {
AliError("No hit array defined");
return kFALSE;
}
Int_t nHit = fArrayH->GetEntries();
if (nHit <= 0) continue;

// Loop over the hits corresponding to this track.
for (Int_t j = 0; j < nHit; j++) {
AliFMDHit* hit = static_cast<AliFMDHit*>(fArrayH->At(j));
if (!ProcessTrack(trackno, track, hit)) return kFALSE;
}
if (!hit) continue;
if (!ProcessTrack(i, track, hit)) return kFALSE;
}
// if (!ProcessTrack(i, track, fArrayH)) return kFALSE;
}
return kTRUE;
}
Expand Down
29 changes: 0 additions & 29 deletions FMD/AliFMDReconstructor.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,26 +222,6 @@ AliFMDReconstructor::GetVertex() const
}


//____________________________________________________________________
void
AliFMDReconstructor::Reconstruct(AliRawReader* /*reader*/, TTree*) const
{
// Reconstruct directly from raw data (no intermediate output on
// digit tree or rec point tree).
// Parameters:
// reader Raw event reader
// ctree Not used.
AliError("Method is not used");
#if 0
TClonesArray* array = new TClonesArray("AliFMDDigit");
AliFMDRawReader rawRead(reader, 0);
rawRead.ReadAdcs(array);
ProcessDigits(array);
array->Delete();
delete array;
#endif
}

//____________________________________________________________________
void
AliFMDReconstructor::Reconstruct(TTree* digitsTree,
Expand Down Expand Up @@ -522,15 +502,6 @@ AliFMDReconstructor::FillESD(TTree* /* digitsTree */,
if (fDiagAll) fDiagAll->Reset();
}

//____________________________________________________________________
void
AliFMDReconstructor::FillESD(AliRawReader*, TTree* clusterTree,
AliESDEvent* esd) const
{
TTree* dummy = 0;
FillESD(dummy, clusterTree, esd);
}

//____________________________________________________________________
//
// EOF
Expand Down
9 changes: 4 additions & 5 deletions FMD/AliFMDReconstructor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,19 @@ class AliFMDReconstructor: public AliReconstructor
@param digitsTree Tree holding the digits of this event
@param clusterTree Tree to store AliFMDRecPoint objects in. */
virtual void Reconstruct(TTree* digitsTree, TTree* clusterTree) const;
/** Not used */
virtual void Reconstruct(AliRawReader *, TTree*) const;
virtual void Reconstruct(AliRawReader *, TTree*) const
{AliError("Method is not used");}
/** Put in the ESD data, the FMD ESD data. The object created by
the Reconstruct member function is copied to the ESD object.
@param digitsTree Tree of digits for this event - not used
@param clusterTree Tree of reconstructed points for this event
- not used.
@param esd ESD object to store data in.
*/
virtual void FillESD(AliRawReader*, TTree*clusterTree, AliESDEvent*esd) const
{FillESD((TTree*)NULL,clusterTree,esd);}
virtual void FillESD(TTree* digitsTree, TTree* clusterTree,
AliESDEvent* esd) const;
/** Forwards to above member function */
virtual void FillESD(AliRawReader*, TTree* clusterTree,
AliESDEvent* esd) const;
/** Not used */
virtual void SetESD(AliESDEvent* esd) { fESD = esd; }
/** Set the noise factor
Expand Down
21 changes: 6 additions & 15 deletions GRP/UpdateCDBVertexDiamond.C
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void UpdateCDBVertexDiamond(Double_t xmed = 0., Double_t ymed = 0., Double_t sigx = 0.005, Double_t sigy = 0.005, Double_t sigz = 5.3) {
void UpdateCDBVertexDiamond() {
// produce the trigger descriptorwith the current AliRoot and store it in the
// CDB

Expand Down Expand Up @@ -26,26 +26,17 @@ void UpdateCDBVertexDiamond(Double_t xmed = 0., Double_t ymed = 0., Double_t sig
alirootv="HEAD";
}else{
alirootv = buf;
metadata->SetResponsible("[email protected]");
metadata->SetComment("Default mean vertex position");
metadata->SetResponsible("Tapan Nayak");
metadata->SetAliRootVersion(alirootv);
metadata->SetComment(Form("Default trigger description produced with root version %s and AliRoot version %s",rootv,alirootv));
}

Printf("Storing in CDB the default trigger description produced with root version %s and AliRoot version %s",rootv,alirootv);

Double_t resolx=35./10000.;
Double_t resoly=35./10000.;
Double_t sigma[3],position[3];
position[0]=xmed;
position[1]=ymed;
position[2]=0.;
sigma[0]=TMath::Sqrt(sigx*sigx+resolx*resolx);
sigma[1]=TMath::Sqrt(sigy*sigy+resoly*resoly);
sigma[2]=sigz;

AliESDVertex *vertex = new AliESDVertex(position,sigma,"vtxmean");
vertex->PrintStatus();
Double_t position[3] = {0.0,0.0,0.0};
Double_t sigma[3] = {0.0,0.0,0.0};
AliESDVertex *vertex = new AliESDVertex(position,sigma,"Default");
vertex->Print();

man->Put(vertex,id,metadata);
}
Expand Down
Loading

0 comments on commit 907dfe6

Please sign in to comment.