]>
git.uio.no Git - u/mrichter/AliRoot.git/log
mivanov [Fri, 13 Jun 2014 23:02:48 +0000 (01:02 +0200)]
sync with master
mivanov [Fri, 13 Jun 2014 22:47:56 +0000 (00:47 +0200)]
Revert back to master version STEER/ESD/AliESDtrack.cxx
mivanov [Fri, 13 Jun 2014 22:34:08 +0000 (00:34 +0200)]
Merge branch 'TPCdev' of https://git.cern.ch/reps/AliRoot into TPCdev
mivanov [Fri, 13 Jun 2014 22:33:44 +0000 (00:33 +0200)]
making script executable
mivanov [Fri, 13 Jun 2014 22:32:18 +0000 (00:32 +0200)]
ATO-58, ATO-18 - Adding diffusion in lognitudinal direction as a parameter
mivanov [Fri, 13 Jun 2014 22:20:42 +0000 (00:20 +0200)]
Merge branch 'master' into TPCdev
Conflicts:
PWGPP/AliAnalysisTaskFilteredTree.cxx
PWGPP/AliAnalysisTaskFilteredTree.h
PWGPP/TRD/AliTRDcheckTRK.cxx
STEER/CDB/AliCDBManager.cxx
STEER/STEERBase/AliLog.cxx
TPC/Rec/AliTPCRecoParam.cxx
TPC/Rec/AliTPCRecoParam.h
TPC/Rec/AliTPCtrack.cxx
TPC/Rec/AliTPCtracker.cxx
TPC/Sim/AliTPCDigitizer.cxx
TRD/AliTRDseedV1.cxx
TRD/AliTRDseedV1.h
TRD/AliTRDtrackerV1.cxx
Unmerged paths:
both modified: PWGPP/AliAnalysisTaskFilteredTree.cxx
git checkout --ours PWGPP/AliAnalysisTaskFilteredTree.cxx
both modified: PWGPP/AliAnalysisTaskFilteredTree.h
git checkout --ours PWGPP/AliAnalysisTaskFilteredTree.h
both modified: PWGPP/TRD/AliTRDcheckTRK.cxx -
git checkout --theirs PWGPP/TRD/AliTRDcheckTRK.cxx
both modified: STEER/CDB/AliCDBManager.cxx
git checkout --theirs STEER/CDB/AliCDBManager.cxx
both modified: STEER/STEERBase/AliLog.cxx
git checkout --ours STEER/STEERBase/AliLog.cxx
both modified: TPC/Rec/AliTPCRecoParam.cxx
git checkout --theirs TPC/Rec/AliTPCRecoParam.cxx
both modified: TPC/Rec/AliTPCRecoParam.h
git checkout --theirs TPC/Rec/AliTPCRecoParam.h
both modified: TPC/Rec/AliTPCtrack.cxx
git checkout --theirs TPC/Rec/AliTPCtrack.cxx
both modified: TPC/Rec/AliTPCtracker.cxx
git checkout --ours TPC/Rec/AliTPCtracker.cxx
both modified: TPC/Sim/AliTPCDigitizer.cxx
git checkout --ours TPC/Sim/AliTPCDigitizer.cxx
both modified: TRD/AliTRDseedV1.cxx
git checkout --theirs TRD/AliTRDseedV1.cxx
both modified: TRD/AliTRDseedV1.h
git checkout --theirs TRD/AliTRDseedV1.h
both modified: TRD/AliTRDtrackerV1.cxx
git checkout --theirs TRD/AliTRDtrackerV1.cxx
policheh [Fri, 13 Jun 2014 16:38:36 +0000 (20:38 +0400)]
Usage of weights in the analysis of MC data.
gconesab [Fri, 13 Jun 2014 16:25:17 +0000 (18:25 +0200)]
remove setting of soon obsolete method AliAODTrack::GetChi2PerNDF
policheh [Fri, 13 Jun 2014 16:16:27 +0000 (20:16 +0400)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
policheh [Fri, 13 Jun 2014 16:12:20 +0000 (20:12 +0400)]
Usage of weights in the analysis of MC data (for the moment weights for LHC13e7 hardcoded).
mvl [Fri, 13 Jun 2014 15:56:07 +0000 (17:56 +0200)]
Remove calls to IsPrimaryCandidate; redundant with filterbit selection on AOD
dkeijden [Fri, 13 Jun 2014 14:16:55 +0000 (16:16 +0200)]
Fixed Eta cut to reconstructed MC particles in PWG4HighPtSpectra task
gconesab [Fri, 13 Jun 2014 12:57:06 +0000 (14:57 +0200)]
change IsTPCOnly by IsTPCConstrained since first is being removed
saiola [Fri, 13 Jun 2014 15:25:13 +0000 (11:25 -0400)]
Bug fix: tracks outside EMCal acceptance were propagated instead of tracks inside
saiola [Fri, 13 Jun 2014 15:22:33 +0000 (11:22 -0400)]
automatically fix cascade bug in LHC11h AOD145 using fAttemptProp
dberzano [Fri, 13 Jun 2014 13:51:50 +0000 (15:51 +0200)]
Cloud RelVal more verbose and using temp dirs
dberzano [Tue, 10 Jun 2014 16:02:58 +0000 (18:02 +0200)]
Script to control Release Validation on the cloud
miweber [Fri, 13 Jun 2014 13:59:59 +0000 (15:59 +0200)]
preparing removal of AliAODTrack::IsPrimaryCandidate
ancastro [Thu, 12 Jun 2014 19:27:04 +0000 (15:27 -0400)]
fixed cluster track matching bug, added QA Histograms
mkrzewic [Fri, 13 Jun 2014 10:48:53 +0000 (12:48 +0200)]
updates form Jan Wagner
agrigora [Fri, 13 Jun 2014 09:28:35 +0000 (11:28 +0200)]
fixing the installation for FJ_includes.h
gconesab [Fri, 13 Jun 2014 09:11:04 +0000 (11:11 +0200)]
fix coverity 24179,24125,24178, check nullness of casted pointers
hristov [Fri, 13 Jun 2014 09:03:25 +0000 (11:03 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
hristov [Fri, 13 Jun 2014 09:03:04 +0000 (11:03 +0200)]
using std::...
mivanov [Fri, 13 Jun 2014 08:48:31 +0000 (10:48 +0200)]
ALIROOT-5177 - protection agains empty histograms in AliTPCPreprocessorOffline::AnalyzeGainDipAngle
hristov [Fri, 13 Jun 2014 08:54:31 +0000 (11:54 +0300)]
Resolving name conflict between Tauola and Photos
majanik [Fri, 13 Jun 2014 08:42:38 +0000 (10:42 +0200)]
Corrections for DEtaDPhi Train
majanik [Fri, 13 Jun 2014 07:15:04 +0000 (09:15 +0200)]
(For the train) small change in the macro with parameters.
mivanov [Fri, 13 Jun 2014 06:55:09 +0000 (08:55 +0200)]
PWGPP-4 Code clean-up
Check pointers in master function
Deleting not used code
Caching esd fileName in Notify instaed accessing it in all Process functions
hristov [Fri, 13 Jun 2014 06:39:27 +0000 (09:39 +0300)]
Restore make htmldoc
mivanov [Fri, 13 Jun 2014 04:57:52 +0000 (06:57 +0200)]
PWGPP-3, PWGPP-4, ATO-52 - switch to configure the fraction of friend tracks using env.variables - for Lego Train
saiola [Thu, 12 Jun 2014 22:16:24 +0000 (18:16 -0400)]
advance class version
morsch [Thu, 12 Jun 2014 20:21:04 +0000 (22:21 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
morsch [Thu, 12 Jun 2014 20:19:06 +0000 (22:19 +0200)]
Update to Photos 3.56
saiola [Thu, 12 Jun 2014 19:52:46 +0000 (15:52 -0400)]
add option for tasks that do not need the EMCal geometry object loaded
rbertens [Thu, 12 Jun 2014 18:27:41 +0000 (20:27 +0200)]
add kAODFilterBit enum for track selection on filterbit only
majanik [Thu, 12 Jun 2014 16:57:56 +0000 (18:57 +0200)]
Re-fix (Config macro with standard AddTask macro again does not need parameters)
morsch [Thu, 12 Jun 2014 15:57:53 +0000 (17:57 +0200)]
- update to newest fit parameters
- resolve floating point exception in PtModifiedHagedornPowerlaw
Theodor Rascanu <trascanu@stud.uni-frankfurt.de>
morsch [Thu, 12 Jun 2014 15:43:06 +0000 (17:43 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
wiechula [Fri, 6 Jun 2014 17:41:32 +0000 (19:41 +0200)]
Temporary splines for LHC12b-e anchored MC
belikov [Thu, 12 Jun 2014 14:25:59 +0000 (16:25 +0200)]
Applying the |Zv|<10cm selection
fbellini [Thu, 12 Jun 2014 13:38:28 +0000 (15:38 +0200)]
Update from Massimo: fixed histogram ranges
prsnko [Thu, 12 Jun 2014 13:41:17 +0000 (17:41 +0400)]
Remove TOF cut in MC
fkrizek [Thu, 12 Jun 2014 12:48:44 +0000 (14:48 +0200)]
Inline declarations removed
fbock [Thu, 12 Jun 2014 13:07:30 +0000 (15:07 +0200)]
- changes for Material Task and Resolution Task, to make them more uniform in the handling of the pPb and PbPb data compared to Standard Pi0 Task
sjena [Thu, 12 Jun 2014 12:32:28 +0000 (14:32 +0200)]
Update from prabhat: Dpt-Dpt Corr
mkrzewic [Thu, 12 Jun 2014 11:55:53 +0000 (13:55 +0200)]
option to run in current directory
instead of using mktemp
reconstructInTemporaryDir=0 (runs directly on the target storage)
reconstructInTemporaryDir=1 (creates a tmp dir with mktemp)
reconstructInTemporaryDir=2 (creates a rundir in $PWD)
gconesab [Thu, 12 Jun 2014 11:39:29 +0000 (13:39 +0200)]
fix passing of calorimeter name to function
prsnko [Thu, 12 Jun 2014 10:33:13 +0000 (14:33 +0400)]
Use fixed Ecut instead of pT-dependent
prsnko [Thu, 12 Jun 2014 10:18:36 +0000 (14:18 +0400)]
LG TOF calibration improved for LHC13bcdef
majanik [Thu, 12 Jun 2014 09:29:49 +0000 (11:29 +0200)]
AddTask macro for QA task corrections - for the train
mkrzewic [Thu, 12 Jun 2014 09:12:40 +0000 (11:12 +0200)]
too many brackets
mivanov [Thu, 12 Jun 2014 08:41:10 +0000 (10:41 +0200)]
PWGPP-3, PWGPP-4, ATO-52 Typo fixed
majanik [Thu, 12 Jun 2014 08:39:43 +0000 (10:39 +0200)]
Correction to AliAnalysisTaskFemto that enables using parameters in Config macro + Files for the Train.
mivanov [Thu, 12 Jun 2014 08:39:31 +0000 (10:39 +0200)]
PWGPP-3, PWGPP-4, ATO-52 - typo fixed
agheata [Thu, 12 Jun 2014 08:18:02 +0000 (10:18 +0200)]
Activating AliSysInfo::SetVerbose when SetNsysInfo is requested
mkrzewic [Thu, 12 Jun 2014 07:45:30 +0000 (09:45 +0200)]
fix run range for 2010
mivanov [Thu, 12 Jun 2014 07:45:51 +0000 (09:45 +0200)]
PWGPP-3, PWGPP-4, ATO-52 Configuration file (proposal) for the unit test
Currently only setup for the AliAnalysisTaskFilteredTest
other options to be tested, increasing number of tests
mivanov [Thu, 12 Jun 2014 07:42:23 +0000 (09:42 +0200)]
PWGPP-3, PWGPP-4, ATO-52 First version of Unit test to check the AliAnalysisTaskFiltered functionality.
jmazer [Thu, 12 Jun 2014 04:22:45 +0000 (00:22 -0400)]
changed from sparse bins and put in an event, jet, track, mixed event counter histo for QA
mfloris [Thu, 12 Jun 2014 07:20:10 +0000 (09:20 +0200)]
Updates for jet test (M Tangaro)
mivanov [Thu, 12 Jun 2014 06:20:35 +0000 (08:20 +0200)]
PWGPP-3, PWGPP-4 - Reducing the size of the output containers with points (Corresponding UnitTest in separate commit))
0.) Downsaling factor controlled by SetFriendDownscaling expressed in number of entries or relative size
1.) Use 0 pointer instead of zerro content (zip not efficent)
2.) Removing dummy friend track info from all exporting trees
AliAnalysisTaskFilteredTree.{h,cxx}
gconesab [Wed, 11 Jun 2014 20:19:42 +0000 (22:19 +0200)]
change labels style, variables in italic
gconesab [Wed, 11 Jun 2014 18:54:26 +0000 (20:54 +0200)]
Add histograms checking origin of pi0 and production vertex
gconesab [Wed, 11 Jun 2014 16:56:11 +0000 (18:56 +0200)]
Add histogram to check the production vertex of the pi0, change style of variables in histograms to italic
rbailhac [Wed, 11 Jun 2014 17:52:07 +0000 (19:52 +0200)]
Merge branch 'master' of http://git.cern.ch/pub/AliRoot
rbailhac [Wed, 11 Jun 2014 17:47:48 +0000 (19:47 +0200)]
p-Pb macros
shahoian [Wed, 11 Jun 2014 17:43:54 +0000 (19:43 +0200)]
Set default verbosity to ON, to prevent failing the tasks which require the sysinfo.log
saiola [Wed, 11 Jun 2014 17:16:27 +0000 (13:16 -0400)]
fix deltaPtemb vs. EP histogram
lramona [Wed, 11 Jun 2014 17:14:11 +0000 (19:14 +0200)]
Added histograms and the possibility to save or not the tree
majanik [Wed, 11 Jun 2014 16:21:36 +0000 (18:21 +0200)]
Correlation function for pair fraction calculations from MC + correction to the bug in Hidden Info in copy constructor.
mivanov [Wed, 11 Jun 2014 16:16:54 +0000 (18:16 +0200)]
ATO-17- First version of crosstalk effect in MC implemented
saiola [Wed, 11 Jun 2014 15:41:43 +0000 (11:41 -0400)]
random track rejection (tracking efficiency studies) only after all cuts have been applied
rbertens [Wed, 11 Jun 2014 13:14:52 +0000 (15:14 +0200)]
renamed class to better reflect functionality (after splitting it into two classes)
rbertens [Wed, 11 Jun 2014 13:13:31 +0000 (15:13 +0200)]
change cmake and preprocessor definitions for transition of AliAnalysisTaskRhoVnModulation to AliAnalysisTaskJetV2
rbertens [Wed, 11 Jun 2014 13:11:23 +0000 (15:11 +0200)]
added new analysis task to replace AliAnalysisTaskRhoVnModulation
pluettig [Wed, 11 Jun 2014 13:32:23 +0000 (15:32 +0200)]
- fix for coverity 23140
- add crosscheck histograms for EP determination and biases
fbock [Wed, 11 Jun 2014 12:37:55 +0000 (14:37 +0200)]
- changes in Material and Resolution task in order to remove added signals from the data
- fixed window for PbPb & pPb in multiplicity (20 < nTracksTPC(eta< 0.9) < 80)
kleinb [Wed, 11 Jun 2014 12:19:51 +0000 (14:19 +0200)]
Fix for JIRA ALIROOT-5460
fbock [Wed, 11 Jun 2014 11:55:12 +0000 (13:55 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
maszyman [Wed, 11 Jun 2014 11:52:57 +0000 (13:52 +0200)]
added Jai's code for V0 analysis (lambda-(anti)lambda correlations)
fbock [Wed, 11 Jun 2014 11:50:17 +0000 (13:50 +0200)]
coverity fixes for: 23292-23294,23153-23155,22457,22005,22001,21998,21816-21821,21814
fbock [Wed, 11 Jun 2014 11:43:51 +0000 (13:43 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
fbock [Wed, 11 Jun 2014 11:41:51 +0000 (13:41 +0200)]
coverity fixes for 21812,21813
morsch [Wed, 11 Jun 2014 11:26:44 +0000 (13:26 +0200)]
GetFirstDaughter
GetLastDaughter
added to VParticle
Assigment of generator index in AliMCEvent
morsch [Wed, 11 Jun 2014 11:22:01 +0000 (13:22 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
morsch [Wed, 11 Jun 2014 11:20:36 +0000 (13:20 +0200)]
GetFirst(Second)Daughter changed to GetFirst(Second)DaughterP
shahoian [Wed, 11 Jun 2014 10:41:24 +0000 (12:41 +0200)]
Possibility to not write syswatch info to file (default)
mivanov [Wed, 11 Jun 2014 10:23:22 +0000 (12:23 +0200)]
PWGPP-3, ATO-19 AliAnalysisTaskFilteredTree.{h,cxx} - Set downscaling factor to limit output size for friend tracks (friends/full) - for the moment for tracks only (V0, dEdx, cosmic to come)
void SetFriendDownscaling(Double_t fact)
zconesa [Wed, 11 Jun 2014 10:18:22 +0000 (12:18 +0200)]
Fix coverity defects 24111 and 23963
zconesa [Wed, 11 Jun 2014 09:11:46 +0000 (11:11 +0200)]
Fix coverity defects 22748 and 23964
zconesa [Wed, 11 Jun 2014 09:08:11 +0000 (11:08 +0200)]
remove some warnings and refinement on output histogram naming
morsch [Wed, 11 Jun 2014 07:41:34 +0000 (09:41 +0200)]
do not set fRotating to kFALSE in Init
M van Leeuwen
prsnko [Wed, 11 Jun 2014 05:52:27 +0000 (09:52 +0400)]
Update from Daniil
prsnko [Wed, 11 Jun 2014 05:24:57 +0000 (09:24 +0400)]
Macros for pi0 flow calculation
gconesab [Tue, 10 Jun 2014 20:25:14 +0000 (22:25 +0200)]
coverity fix 22887, check if the correct variable is null
gconesab [Tue, 10 Jun 2014 20:20:51 +0000 (22:20 +0200)]
fix coverity 23059, fix indentation
gconesab [Tue, 10 Jun 2014 20:15:56 +0000 (22:15 +0200)]
coverity 23301, not real bug but avoid future complains
gconesab [Tue, 10 Jun 2014 20:09:32 +0000 (22:09 +0200)]
try coverity fix 23965, condition checked twice
gconesab [Tue, 10 Jun 2014 20:06:50 +0000 (22:06 +0200)]
try coverity fix, 23972, 23971, delete array properly