Skip to content

Commit

Permalink
This commit was manufactured by cvs2svn to create tag 'v4-05-11'.
Browse files Browse the repository at this point in the history
  • Loading branch information
(no author) committed Apr 18, 2007
1 parent 98358f2 commit 5aea367
Show file tree
Hide file tree
Showing 18 changed files with 3,390 additions and 55 deletions.
18 changes: 4 additions & 14 deletions HMPID/AliHMPIDParam.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <AliRunLoader.h> //Stack()
#include <AliStack.h> //Stack()
#include <TParticle.h> //Stack()
#include <TGeoPhysicalNode.h> //ctor

ClassImp(AliHMPIDParam)

Expand All @@ -35,19 +34,10 @@ AliHMPIDParam::AliHMPIDParam():TNamed("RichParam","default version")
// Note that TGeoManager should be already initialized from geometry.root file
fX=0.5*AliHMPIDDigit::SizeAllX();
fY=0.5*AliHMPIDDigit::SizeAllY();
for(Int_t i=AliHMPIDDigit::kMinCh;i<=AliHMPIDDigit::kMaxCh;i++)
if(gGeoManager && gGeoManager->IsClosed()) {
// fM[i]=(TGeoHMatrix*)gGeoManager->GetVolume("ALIC")->GetNode(Form("HMPID_%i",i))->GetMatrix(); // previous style
TGeoPNEntry* pne = gGeoManager->GetAlignableEntry(i);
if (!pne) {
AliErrorClass(Form("The symbolic volume %s does not correspond to any physical entry!",Form("HMPID_%i",i)));
fM[i]=new TGeoHMatrix;
IdealPosition(i,fM[i]);
} else {
TGeoPhysicalNode *pnode = pne->GetPhysicalNode();
fM[i]=pnode->GetMatrix();
}
} else{
for(Int_t i=0;i<7;i++)
if(gGeoManager)
fM[i]=(TGeoHMatrix*)gGeoManager->GetVolume("ALIC")->GetNode(Form("HMPID_%i",i))->GetMatrix();
else{
fM[i]=new TGeoHMatrix;
IdealPosition(i,fM[i]);
}
Expand Down
38 changes: 10 additions & 28 deletions HMPID/Hconfig.C
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#include <TPDGCode.h>

Bool_t gGun1 =kFALSE;
Bool_t gGun7 =kFALSE;
Bool_t gGunZ =kFALSE;
Bool_t gBox =kFALSE;
Bool_t gHijing =kFALSE;
Bool_t gHijingPara=kFALSE;
Bool_t gPythia =kFALSE;

class HmpConfig : public TGMainFrame
{
RQ_OBJECT()
Expand Down Expand Up @@ -244,82 +236,72 @@ void HmpConfig::GenAddSlot(Int_t id)
fGenBG->GetButton(kGun1)->SetEnabled(kFALSE); fGenF->HideFrame(fGenNprimCO); fGenF->HideFrame(fGenPmaxCO);
fGenBG->GetButton(kGun7)->SetEnabled(kFALSE);
fGenBG->GetButton(kBox )->SetEnabled(kFALSE); fGenPidCO->Select(kProton); fGenPminCO->Select(25);
fGenF->HideFrame(fGenChamCO);
gGunZ=!gGunZ;
}
if(id==kGun1){
fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE); fGenF->HideFrame(fGenNprimCO); fGenF->HideFrame(fGenPmaxCO);
fGenBG->GetButton(kGun7)->SetEnabled(kFALSE); fGenPidCO->Select(kProton); fGenPminCO->Select(25); fGenChamCO->Select(4);
fGenBG->GetButton(kBox )->SetEnabled(kFALSE);
gGun1=!gGun1;
}
if(id==kGun7){
fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE); fGenF->HideFrame(fGenNprimCO);
fGenBG->GetButton(kGun1)->SetEnabled(kFALSE); fGenPidCO->Select(kProton);
fGenBG->GetButton(kBox )->SetEnabled(kFALSE); fGenF->HideFrame(fGenPmaxCO); fGenPminCO->Select(25);
fGenF->HideFrame(fGenChamCO);
gGun7=!gGun7;
}
if(id==kBox){
fGenBG->GetButton(kGunZ)->SetEnabled(kFALSE); fGenNprimCO->Select(500);
fGenBG->GetButton(kGun1)->SetEnabled(kFALSE); fGenPidCO ->Select(kProton);
fGenBG->GetButton(kGun7)->SetEnabled(kFALSE); fGenPminCO ->Select(15); fGenPmaxCO->Select(15);
fGenF->HideFrame(fGenChamCO);
gBox=!gBox;
}
if(id==kHijing){
// fGenBG->GetButton(kHijing)->ChangeBackground(0xff0000);
fGenBG->GetButton(kHijing)->ChangeBackground(0xff0000);
fGenBG->GetButton(kHijingPara)->SetEnabled(kFALSE);
fGenBG->GetButton(kPythia)->SetEnabled(kFALSE);
gHijing=!gHijing;
}
if(id==kHijingPara){
fGenBG->GetButton(kHijing)->SetEnabled(kFALSE); fGenNprimCO->Select(500);
fGenBG->GetButton(kPythia)->SetEnabled(kFALSE);
gHijingPara=!gHijingPara;
}
if(id==kPythia){
fGenBG->GetButton(kHijing)->SetEnabled(kFALSE);
fGenBG->GetButton(kHijingPara)->SetEnabled(kFALSE);
gPythia=!gPythia;
}
}//GenAddSlot()
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
void HmpConfig::GenRemSlot(Int_t id)
{//is invoked when any of generator check button is released
if(id==kGunZ&&!gGunZ){
if(id==kGunZ){
fGenBG->GetButton(kGun1)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO);
fGenBG->GetButton(kGun7)->SetEnabled(); fGenPidCO ->Select(kNotUsed);
fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed);
}
if(id==kGun1&&!gGun1){
if(id==kGun1){
fGenBG->GetButton(kGunZ)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO);
fGenBG->GetButton(kGun7)->SetEnabled(); fGenPidCO ->Select(kNotUsed);
fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed);
fGenChamCO ->Select(kNotUsed);
}
if(id==kGun7&&!gGun7){
if(id==kGun7){
fGenBG->GetButton(kGunZ)->SetEnabled(); fGenF->ShowFrame(fGenNprimCO);
fGenBG->GetButton(kGun1)->SetEnabled(); fGenPidCO ->Select(kNotUsed);
fGenBG->GetButton(kBox )->SetEnabled(); fGenF->ShowFrame(fGenPmaxCO); fGenPminCO ->Select(kNotUsed);
fGenF->ShowFrame(fGenChamCO);
}
if(id==kBox&&!gBox){
if(id==kBox){
fGenBG->GetButton(kGunZ)->SetEnabled(); fGenNprimCO->Select(kNotUsed);
fGenBG->GetButton(kGun1)->SetEnabled(); fGenPidCO ->Select(kNotUsed);
fGenBG->GetButton(kGun7)->SetEnabled(); fGenPminCO ->Select(kNotUsed); fGenPmaxCO->Select(kNotUsed);
fGenChamCO ->Select(kNotUsed);
}
if(id==kHijing&&!gHijing){
// fGenBG->GetButton(kHijing)->ChangeBackground(0xbebebe);
if(id==kHijing){
fGenBG->GetButton(kHijing)->ChangeBackground(0xbebebe);
fGenBG->GetButton(kHijingPara)->SetEnabled();
fGenBG->GetButton(kPythia)->SetEnabled();
}
if(id==kHijingPara&&!gHijingPara){
fGenBG->GetButton(kHijing)->SetEnabled(); fGenNprimCO->Select(kNotUsed);
if(id==kHijingPara){
fGenBG->GetButton(kHijing)->SetEnabled();
fGenBG->GetButton(kPythia)->SetEnabled();
}
if(id==kPythia&&!gPythia){
if(id==kPythia){
fGenBG->GetButton(kHijing)->SetEnabled();
fGenBG->GetButton(kHijingPara)->SetEnabled();
}
Expand Down
9 changes: 5 additions & 4 deletions PMD/AliPMDClusteringV1.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ void AliPMDClusteringV1::DoClust(Int_t idet, Int_t ismn,
j = jd;
i = id+(ndimYr/2-1)-(jd/2);

Int_t ij = i + j*kNDIMX;
//PH Int_t ij = i + j*kNDIMX;
Int_t ij = i + j*ndimXr;

if (ismn < 12)
{
Expand Down Expand Up @@ -383,13 +384,13 @@ void AliPMDClusteringV1::RefClust(Int_t incr, Double_t edepcell[])

AliPMDcludata *pmdcludata = 0;

Int_t *cellCount;
Int_t **cellXY;
Int_t *cellCount = 0x0;
Int_t **cellXY = 0x0;
const Int_t kdim = 4500;

Int_t i, j, k, i1, i2, id, icl, itest,ihld, ig, nsupcl,clno;
Int_t t[kdim];
Int_t ncl[kdim], iord[kdim], lev1[20], lev2[20];
Int_t ncl[kdim], iord[kdim], lev1[kdim], lev2[kdim];
Int_t clxy[15];
Float_t clusdata[6];
Double_t x1, y1, z1, x2, y2, z2, dist,rr,sum;
Expand Down
6 changes: 2 additions & 4 deletions RAW/AliRawDB.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,7 @@ Int_t AliRawDB::GetTotalSize()
TKey *key = dir->GetKey(fTree->GetName());
if (key) skey = key->GetKeylen();
}
total += skey;
if (fTree->GetZipBytes() > 0) total += fTree->GetTotBytes();
total += skey + fTree->GetZipBytes();
}

if(fESDTree)
Expand All @@ -390,8 +389,7 @@ Int_t AliRawDB::GetTotalSize()
TKey *key = dir->GetKey(fESDTree->GetName());
if (key) skey = key->GetKeylen();
}
total += skey;
if (fESDTree->GetZipBytes() > 0) total += fESDTree->GetTotBytes();
total += skey + fESDTree->GetZipBytes();
}

return total;
Expand Down
5 changes: 4 additions & 1 deletion STEER/AliVertex.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ AliVertex::AliVertex(const AliVertex &source):
TNamed(source),
fSigma(source.GetDispersion()),
fNContributors(source.GetNContributors()),
fNIndices(source.GetNIndices())
fNIndices(source.GetNIndices()),
fIndices(0x0)
{
//
// Copy constructor
Expand All @@ -87,6 +88,7 @@ AliVertex &AliVertex::operator=(const AliVertex &source){
fSigma = source.GetDispersion();
fNContributors = source.GetNContributors();
fNIndices = source.GetNIndices();
fIndices = 0x0;
if(source.fNIndices>0) {
fIndices = new UShort_t[fNIndices];
memcpy(fIndices,source.fIndices,fNIndices*sizeof(UShort_t));
Expand Down Expand Up @@ -120,6 +122,7 @@ void AliVertex::SetIndices(Int_t nindices,UShort_t *indices) {
//
if(fNContributors<1) { printf("fNContributors<1"); return; }
fNIndices = nindices;
delete [] fIndices;
fIndices = new UShort_t[fNIndices];
for(Int_t i=0;i<fNIndices;i++) fIndices[i] = indices[i];
return;
Expand Down
4 changes: 2 additions & 2 deletions STEER/TTreeStream.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@ void TTreeStream::BuildTree(){
//
// Build the Tree
//
if (fTree->GetEntries()>0) return;
fTree = new TTree(GetName(),GetName());
if (fTree && fTree->GetEntries()>0) return;
if (!fTree) fTree = new TTree(GetName(),GetName());
Int_t entries = fElements->GetEntriesFast();
fBranches = new TObjArray(entries);

Expand Down
2 changes: 1 addition & 1 deletion TPC/AliTPCSensorTemp.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
//


#include <strings.h>
#include "AliTPCSensorTemp.h"
ClassImp(AliTPCSensorTemp)

Expand Down
2 changes: 1 addition & 1 deletion TRD/AliTRDalignment.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ AliTRDalignment::AliTRDalignment()
double z[2] = {-(77.9/2.0-2.0),77.9/2.0-1.5}; // lab r, or better tracking-x

for (int j=0; j<2; j++) for (int k=0; k<2; k++) for (int l=0; l<2; l++) {
fSurveyX0[j][k][l] = -pow(-1,l) * x[k];
fSurveyX0[j][k][l] = -TMath::Power(-1,l) * x[k];
fSurveyY0[j][k][l] = y[j];
fSurveyZ0[j][k][l] = z[k];
}
Expand Down
Loading

0 comments on commit 5aea367

Please sign in to comment.