Skip to content

Commit

Permalink
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbroz84
mbroz84 committed May 20, 2016
2 parents 8cb2c28 + 7ea3a99 commit a9e4373
Show file tree
Hide file tree
Showing 9 changed files with 570 additions and 238 deletions.
529 changes: 370 additions & 159 deletions STEER/STEER/AliMC.cxx
View file

Large diffs are not rendered by default.

139 changes: 100 additions & 39 deletions STEER/STEERBase/AliPDG.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Can be used by TGeant3 and TGeant4
// It contains also the constants for the PDG particle IDs.
// Should evolve towards dynamical loading from external data base.
// Comments to: [email protected]
// Comments to: [email protected]

#include "AliPDG.h"
#include "TDatabasePDG.h"
Expand All @@ -34,7 +34,7 @@ void AliPDG::AddParticlesToPdgDataBase()
//
// Add particles to the PDG data base
//

static Bool_t bAdded = kFALSE;
// Check if already called
if(bAdded)return;
Expand All @@ -44,7 +44,7 @@ void AliPDG::AddParticlesToPdgDataBase()
const Int_t kspe=50000000;

// PDG nuclear states are 10-digit numbers
// 10LZZZAAAI e.g. deuteron is
// 10LZZZAAAI e.g. deuteron is
// 1000010020
const Int_t kion=1000000000;

Expand Down Expand Up @@ -82,63 +82,63 @@ void AliPDG::AddParticlesToPdgDataBase()

// From Herwig
pdgDB->AddParticle("PSID ", " ", 3.7699, kFALSE, 0.0, 0, "meson", 30443);

pdgDB->AddParticle("A_00 ", " ", 0.9960, kFALSE, 0.0, 0, "meson", 9000111);
pdgDB->AddParticle("A_0+ ", " ", 0.9960, kFALSE, 0.0,+3, "meson", 9000211);
pdgDB->AddParticle("A_0- ", " ", 0.9960, kFALSE, 0.0,-3, "meson", -9000211);

pdgDB->AddParticle("F0P0 ", " ", 0.9960, kFALSE, 0.0, 0, "meson", 9010221);

pdgDB->AddParticle("KDL_2+ ", " ", 1.773, kFALSE, 0.0,+3, "meson", 10325);
pdgDB->AddParticle("KDL_2- ", " ", 1.773, kFALSE, 0.0,-3, "meson", -10325);
pdgDB->AddParticle("A_00 ", " ", 0.9960, kFALSE, 0.0, 0, "meson", 9000111);
pdgDB->AddParticle("A_0+ ", " ", 0.9960, kFALSE, 0.0,+3, "meson", 9000211);
pdgDB->AddParticle("A_0- ", " ", 0.9960, kFALSE, 0.0,-3, "meson", -9000211);

pdgDB->AddParticle("F0P0 ", " ", 0.9960, kFALSE, 0.0, 0, "meson", 9010221);

pdgDB->AddParticle("KDL_20 ", " ", 1.773, kFALSE, 0.0, 0, "meson", 10315);
pdgDB->AddParticle("KDL_2BR0", " ", 1.773, kFALSE, 0.0, 0, "meson", -10315);
pdgDB->AddParticle("KDL_2+ ", " ", 1.773, kFALSE, 0.0,+3, "meson", 10325);
pdgDB->AddParticle("KDL_2- ", " ", 1.773, kFALSE, 0.0,-3, "meson", -10325);

pdgDB->AddParticle("KDL_20 ", " ", 1.773, kFALSE, 0.0, 0, "meson", 10315);
pdgDB->AddParticle("KDL_2BR0", " ", 1.773, kFALSE, 0.0, 0, "meson", -10315);

pdgDB->AddParticle("PI_2+ ", " ", 1.670, kFALSE, 0.0,+3, "meson", 10215);
pdgDB->AddParticle("PI_2- ", " ", 1.670, kFALSE, 0.0,-3, "meson", -10215);
pdgDB->AddParticle("PI_20 ", " ", 1.670, kFALSE, 0.0, 0, "meson", 10115);
pdgDB->AddParticle("KD*+ ", " ", 1.717, kFALSE, 0.0,+3, "meson", 30323);
pdgDB->AddParticle("KD*- ", " ", 1.717, kFALSE, 0.0,-3, "meson", -30323);

pdgDB->AddParticle("KD*0 ", " ", 1.717, kFALSE, 0.0, 0, "meson", 30313);
pdgDB->AddParticle("KDBR*0 ", " ", 1.717, kFALSE, 0.0, 0, "meson", -30313);

pdgDB->AddParticle("RHOD+ ", " ", 1.700, kFALSE, 0.0,+3, "meson", 30213);
pdgDB->AddParticle("RHOD- ", " ", 1.700, kFALSE, 0.0,-3, "meson", -30213);
pdgDB->AddParticle("RHOD0 ", " ", 1.700, kFALSE, 0.0, 0, "meson", 30113);
pdgDB->AddParticle("ETA_2(L)", " ", 1.632, kFALSE, 0.0, 0, "meson", 10225);
pdgDB->AddParticle("ETA_2(H)", " ", 1.854, kFALSE, 0.0, 0, "meson", 10335);


pdgDB->AddParticle("KD*+ ", " ", 1.717, kFALSE, 0.0,+3, "meson", 30323);
pdgDB->AddParticle("KD*- ", " ", 1.717, kFALSE, 0.0,-3, "meson", -30323);

pdgDB->AddParticle("KD*0 ", " ", 1.717, kFALSE, 0.0, 0, "meson", 30313);
pdgDB->AddParticle("KDBR*0 ", " ", 1.717, kFALSE, 0.0, 0, "meson", -30313);

pdgDB->AddParticle("RHOD+ ", " ", 1.700, kFALSE, 0.0,+3, "meson", 30213);
pdgDB->AddParticle("RHOD- ", " ", 1.700, kFALSE, 0.0,-3, "meson", -30213);
pdgDB->AddParticle("RHOD0 ", " ", 1.700, kFALSE, 0.0, 0, "meson", 30113);

pdgDB->AddParticle("ETA_2(L)", " ", 1.632, kFALSE, 0.0, 0, "meson", 10225);
pdgDB->AddParticle("ETA_2(H)", " ", 1.854, kFALSE, 0.0, 0, "meson", 10335);
pdgDB->AddParticle("OMEGA(H)", " ", 1.649, kFALSE, 0.0, 0, "meson", 30223);


pdgDB->AddParticle("KDH_2+ ", " ", 1.816, kFALSE, 0.0,+3, "meson", 20325);
pdgDB->AddParticle("KDH_2- ", " ", 1.816, kFALSE, 0.0,-3, "meson", -20325);

pdgDB->AddParticle("KDH_20 ", " ", 1.816, kFALSE, 0.0, 0, "meson", 20315);
pdgDB->AddParticle("KDH_2BR0", " ", 1.816, kFALSE, 0.0, 0, "meson", -20315);


pdgDB->AddParticle("KD_3+ ", " ", 1.773, kFALSE, 0.0,+3, "meson", 327);
pdgDB->AddParticle("KD_3- ", " ", 1.773, kFALSE, 0.0,-3, "meson", -327);

pdgDB->AddParticle("KD_30 ", " ", 1.773, kFALSE, 0.0, 0, "meson", 317);
pdgDB->AddParticle("KD_3BR0 ", " ", 1.773, kFALSE, 0.0, 0, "meson", -317);

pdgDB->AddParticle("RHO_3+ ", " ", 1.691, kFALSE, 0.0,+3, "meson", 217);
pdgDB->AddParticle("RHO_3- ", " ", 1.691, kFALSE, 0.0,-3, "meson", -217);
pdgDB->AddParticle("RHO_30 ", " ", 1.691, kFALSE, 0.0, 0, "meson", 117);
pdgDB->AddParticle("OMEGA_3 ", " ", 1.667, kFALSE, 0.0, 0, "meson", 227);
pdgDB->AddParticle("PHI_3 ", " ", 1.854, kFALSE, 0.0, 0, "meson", 337);

pdgDB->AddParticle("CHI2P_B0", " ", 10.232, kFALSE, 0.0, 0, "meson", 110551);
pdgDB->AddParticle("CHI2P_B1", " ", 10.255, kFALSE, 0.0, 0, "meson", 120553);
pdgDB->AddParticle("CHI2P_B2", " ", 10.269, kFALSE, 0.0, 0, "meson", 100555);
pdgDB->AddParticle("UPSLON4S", " ", 10.580, kFALSE, 0.0, 0, "meson", 300553);


// IONS
//
Expand Down Expand Up @@ -176,7 +176,7 @@ void AliPDG::AddParticlesToPdgDataBase()
pdgDB->AddAntiParticle("AntiAlpha", - ionCode);

// Special particles
//
//
pdgDB->AddParticle("Cherenkov","Cherenkov",0,kFALSE,
0,0,"Special",kspe+50);
pdgDB->AddParticle("FeedbackPhoton","FeedbackPhoton",0,kFALSE,
Expand Down Expand Up @@ -258,18 +258,81 @@ void AliPDG::AddParticlesToPdgDataBase()
2.5e-15, 0, "Special", ionCode);
}

ionCode = 1030000020;
ionCode = 1020010020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("Xi0Proton","Xi0Proton", 2.248, kFALSE,
5e-15, 3, "Ion", ionCode);
}

ionCode = -1030000020;
ionCode = -1020010020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiXi0Proton","AntiXi0Proton", 2.248, kFALSE,
5e-15, 3, "Ion", ionCode);
}

ionCode = 1030000020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("OmegaProton","OmegaProton", 2.592, kFALSE,
2.5e-15, 0, "Special", ionCode);
}

ionCode = -1030000020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiOmegaProton","AntiOmegaProton", 2.592, kFALSE,
2.5e-15, 0, "Special", ionCode);
}

ionCode = 1030010020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("OmegaNeutron","OmegaNeutron", 2.472, kFALSE,
0.003, 3, "Special", ionCode);
}

ionCode = -1030010020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiOmegaNeutron","AntiOmegaNeutron", 2.472, kFALSE,
0.003, 3, "Special", ionCode);
}

ionCode = 1060020020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("OmegaOmega","OmegaOmega", 3.229, kFALSE,
2.5e-15, 6, "Special", ionCode);
}

ionCode = -1060020020;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiOmegaOmega","AntiOmegaOmega", 3.229, kFALSE,
2.5e-15, 6, "Special", ionCode);
}

ionCode = 1010010021;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("Lambda1405Proton","Lambda1405Proton", 2.295, kFALSE,
0.05, 3, "Special", ionCode);
}

ionCode = -1010010021;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiLambda1405Proton","AntiLambda1405Proton", 2.295, kFALSE,
0.05, 3, "Special", ionCode);
}

ionCode = 1020000021;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("Lambda1405Lambda1405","Lambda1405Lambda1405", 2.693, kFALSE,
0.05, 0, "Special", ionCode);
}

ionCode = -1020000021;
if(!pdgDB->GetParticle(ionCode)){
pdgDB->AddParticle("AntiLambda1405Lambda1405","AntiLambda1405Lambda1405", 2.693, kFALSE,
0.05, 0, "Special", ionCode);
}




// Special resonances

ionCode = 9010221;
Expand All @@ -285,5 +348,3 @@ void AliPDG::AddParticlesToPdgDataBase()
}

}


10 changes: 7 additions & 3 deletions T0/T0base/AliT0RecPoint.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,22 @@ ClassImp(AliT0RecPoint)
fPileup(kFALSE),
fSattelite(kFALSE),
fTime1stA(99999),
fTime1stC(99999)
fTime1stC(99999)



{
//ctor
for (Int_t i=0; i<24; i++) { fTime[i]=0; fADC[i]=0; fADCLED[i]=0;
for (Int_t i=0; i<24; i++) {
fTime[i]=0; fADC[i]=0; fADCLED[i]=0;
for(Int_t iHit=0; iHit<5; iHit++) {
fTimeFull[i][iHit] = 0;
fOrA[iHit] = 0;
fOrC[iHit] = 0;
fTVDC[iHit] = 0;
}
}
}
for (Int_t i=0; i<4; i++) ftimeFIT[i]=0;
}
//_____________________________________________________________________________

Expand Down Expand Up @@ -93,6 +96,7 @@ AliT0RecPoint::AliT0RecPoint(const AliT0RecPoint &r):TObject(),
fTVDC[iHit] = r.fTVDC[iHit];
}
}
for (Int_t i=0; i<4; i++) r.ftimeFIT[i];
// ((AliT0RecPoint &) r).Copy(*this);

}
Expand Down
7 changes: 5 additions & 2 deletions T0/T0base/AliT0RecPoint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ class AliT0RecPoint: public TObject {
void SetOrC (Int_t hit, Float_t time) { fOrC[hit] = time;}
void SetTVDC(Int_t hit, Float_t time) { fTVDC[hit] = time;}

private:
void SetFITTime (Int_t ipmt, Double32_t time) { ftimeFIT[ipmt] = time;}
Double32_t GetFITTime (Int_t ipmt)const { return ftimeFIT[ipmt];}
private:
Double32_t fTimeAverage; // Average time with best particles
Int_t fTimeOnlineMean; // online mean signal
Double32_t fVertexPosition; // Diffrence time between C and A
Expand All @@ -86,8 +88,9 @@ class AliT0RecPoint: public TObject {
Bool_t fSattelite;
Double32_t fTime1stA; //TOF first particle on the A
Double32_t fTime1stC; //TOF first particle on the C
Float_t ftimeFIT[4]; // time signals from FIT MCP PMT

ClassDef(AliT0RecPoint,8) // RecPoints (Header) object for set:T0
ClassDef(AliT0RecPoint,9) // RecPoints (Header) object for set:T0
};

typedef AliT0RecPoint AliSTARTRecPoint; // for backward compatibility
Expand Down
27 changes: 19 additions & 8 deletions T0/T0rec/AliT0Reconstructor.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,17 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
frecpoints.SetMultC(Float_t(amplitudeNew[25]) );
// printf ("Reconstruct ::: T0 MPDA %i MPDC %i", amplitude[24], amplitude[25]);

//FIT CFD
Double32_t timeFIT=0;
for (int i=0; i<4; i++) {
for (Int_t iHit=0; iHit<5; iHit++) {
if(alldata[i+211][iHit]>9000 && alldata[i+211][iHit]<12000) {
timeFIT= Double32_t(alldata[i+211][iHit]);
frecpoints.SetFITTime(i, timeFIT);
break;
}
}
}

} // if (else )raw data
recTree->Fill();
Expand Down Expand Up @@ -747,12 +758,12 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
fESDTZERO->SetOrA(iHit,frecpoints.GetOrA(iHit));
fESDTZERO->SetOrC(iHit,frecpoints.GetOrC(iHit));

for (Int_t i0=0; i0<24; i0++) {
fESDTZERO->SetTimeFull(i0, iHit,frecpoints.GetTimeFull(i0,iHit));
}
}

for (Int_t i0=0; i0<24; i0++)
fESDTZERO->SetTimeFull(i0, iHit,frecpoints.GetTimeFull(i0,iHit));
//FIT CFD
for (Int_t i0=0; i0<4; i0++)
fESDTZERO->SetPileupTime(i0, frecpoints.GetFITTime(i0)); //// 19.05.2016
AliDebug(1,Form("T0: SPDshift %f Vertex %f (T0A+T0C)/2 best %f #ps T0signal %f ps OrA %f ps OrC %f ps T0trig %i\n",shift, zPosition, timemean[0], timeClock[0], timeClock[1], timeClock[2], trig));

//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand All @@ -766,8 +777,8 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
TBits pileout =fESDTZERO-> GetT0PileupBits();
pileout.Print();

for (Int_t i=0; i<5; i++) {
fESDTZERO->SetPileupTime(i, frecpoints.GetTVDC(i) ) ;
// for (Int_t i=0; i<5; i++) {
// fESDTZERO->SetPileupTime(i, frecpoints.GetTVDC(i) ) ;
// printf("!!!!!! FillESD :: pileup %i %f %f \n", i,fESDTZERO->GetPileupTime(i), frecpoints.GetTVDC(i));
}
Bool_t sat = SatelliteFlag();
Expand Down
24 changes: 24 additions & 0 deletions TPC/TPCbase/AliTPCChebCorr.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <TH1.h>
#include <TAxis.h>
#include <TGraph.h>
#include <TBits.h>

ClassImp(AliTPCChebCorr)

Expand Down Expand Up @@ -311,3 +312,26 @@ Int_t AliTPCChebCorr::GetRun() const
if (!runstr.IsDigit()) return -1;
return runstr.Atoi();
}

//__________________________________________
Bool_t AliTPCChebCorr::IsRowMasked(int sector72,int row) const
{
// check if row was masked (sector 0-71, IROC/OROC rows convention
if (sector72>kMaxIROCSector) row += kNRowsIROC; // we are in OROC
float tz[2] = {0.f,((sector72/kNSectors)&0x1) ? -0.1f:0.1f}; // where to query
const AliCheb2DStack* par = GetParam(sector72,tz[0],tz[1]);
if (!par) return kTRUE;
return par->Eval(row,par->GetDimOut()-1,tz)<1e-6; // blocked rows have dispersion set to 0
}

//__________________________________________
Int_t AliTPCChebCorr::GetNMaskedRows(int sector72,TBits* masked) const
{
// count masked rows, if TBits provided, set the masked rows bits
int nmasked = 0;
int nr = (sector72/kNSectorsIROC)==0 ? kNRowsIROC : kNRows-kNRowsIROC;
for (int ir=nr;ir--;) {
if (IsRowMasked(sector72,ir)) {nmasked++; if (masked) masked->SetBitNumber(ir);}
}
return nmasked;
}
3 changes: 3 additions & 0 deletions TPC/TPCbase/AliTPCChebCorr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "AliLog.h"
class TGraph;
class TH1;
class TBits;

class AliTPCChebCorr : public TNamed
{
Expand Down Expand Up @@ -91,6 +92,8 @@ class AliTPCChebCorr : public TNamed
void Eval(int sector, int row, float tz[2], float *corr) const;
Float_t Eval(int sector, int row, float y2x, float z, int dimOut) const;
Float_t Eval(int sector, int row, float tz[2], int dimOut) const;
Bool_t IsRowMasked(int sector72,int row) const;
Int_t GetNMaskedRows(int sector72, TBits* masked=0) const;
void Init();
Int_t GetDimOut() const;
static float GetMaxY2X() {return fgkY2XHSpan;}
Expand Down
Loading

0 comments on commit a9e4373

Please sign in to comment.