]>
git.uio.no Git - u/mrichter/AliRoot.git/log
Julian Book [Thu, 12 Dec 2013 14:47:51 +0000 (15:47 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Julian Book [Thu, 12 Dec 2013 14:45:57 +0000 (15:45 +0100)]
-updated addtask marcel
Andreas Morsch [Thu, 12 Dec 2013 14:08:11 +0000 (15:08 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Andreas Morsch [Thu, 12 Dec 2013 14:05:24 +0000 (15:05 +0100)]
Do not update impact parameter in case of event repetition
except for Ncoll==0
Michael Weber [Thu, 12 Dec 2013 13:38:40 +0000 (14:38 +0100)]
Revert "test (MW)"
This reverts commit
3b3e340418813ea1ed5c9885c79f4f74c716b9b5 .
Michael Weber [Thu, 12 Dec 2013 13:38:09 +0000 (14:38 +0100)]
Revert "- test commit"
This reverts commit
a30750ffda6cf2703fca7c37be7ecca9f9e0bf92 .
Michael Weber [Thu, 12 Dec 2013 13:37:56 +0000 (14:37 +0100)]
Revert "- test commit"
This reverts commit
084633155621913981ae8bcfbc3b9856d05f5c7e .
Michael Weber [Thu, 12 Dec 2013 13:37:39 +0000 (14:37 +0100)]
Revert "- test commit"
This reverts commit
a68097cfd9c5fc36216315b7d295e4c4831683c4 .
Michael Weber [Thu, 12 Dec 2013 13:35:39 +0000 (14:35 +0100)]
Revert "test commit"
This reverts commit
fafdb934f318d50ed09b79697b04932d0c272229 .
Michael Weber [Thu, 12 Dec 2013 13:34:46 +0000 (14:34 +0100)]
Revert "- test commit"
This reverts commit
f1d8040fbf1f354862e2035d8500cb44a0c8ffa5 .
Michael Weber [Thu, 12 Dec 2013 13:30:16 +0000 (14:30 +0100)]
Revert "- test commit"
This reverts commit
06220bf556ad17c013dd57b637ffe57cc980ed24 .
Michael Weber [Thu, 12 Dec 2013 13:28:53 +0000 (14:28 +0100)]
Revert "test adding file"
This reverts commit
ee945fc4914cd9e57fd33d803750fd1f49b9d69c .
Andreas Morsch [Thu, 12 Dec 2013 13:04:55 +0000 (14:04 +0100)]
Coverity Fix
Daniel Lohner
mverweij [Thu, 12 Dec 2013 11:17:44 +0000 (12:17 +0100)]
Merge branch 'fixwarnings'
Dhevan Raja Gangadharan [Thu, 12 Dec 2013 11:17:16 +0000 (12:17 +0100)]
K0s code update (Matt Steinpreis)
mverweij [Thu, 12 Dec 2013 11:17:00 +0000 (12:17 +0100)]
fix warnings
Dhevan Raja Gangadharan [Thu, 12 Dec 2013 11:08:40 +0000 (12:08 +0100)]
Exec() changed to UserExec(), Muon histos added
Jan Fiete Grosse-Oetringhaus [Thu, 12 Dec 2013 08:58:03 +0000 (09:58 +0100)]
randomization of reaction plane
inv yield plot
centrality weighting for MC
Michael Weber [Thu, 12 Dec 2013 09:55:59 +0000 (10:55 +0100)]
implementing centrality flattening for 2011 data (copied from AliAnalysisTaskPhiCorrelations as long as AliCentralityFlattening is not available)
mweber [Thu, 12 Dec 2013 08:59:26 +0000 (09:59 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
mverweij [Wed, 11 Dec 2013 21:09:28 +0000 (22:09 +0100)]
Merge branch 'esdfilter' which has creation of library for ESD filter + copy calo info for all tracks
mverweij [Wed, 11 Dec 2013 21:08:06 +0000 (22:08 +0100)]
move ESDfilter to separate library + copy calo info for all tracks
Leonardo Milano [Wed, 11 Dec 2013 21:06:14 +0000 (22:06 +0100)]
improved TOF response for new AOD productions (T0 subtraction)
mverweij [Wed, 11 Dec 2013 17:26:28 +0000 (18:26 +0100)]
change binning, remove debug info
mweber [Wed, 11 Dec 2013 15:53:33 +0000 (16:53 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Mateusz Ploskon [Wed, 11 Dec 2013 14:31:53 +0000 (15:31 +0100)]
Coverity fix - issue related to /PWGHF/vertexingHF/AliRDHFCuts::PtBin(Double_t) const
Julian Book [Wed, 11 Dec 2013 14:37:08 +0000 (15:37 +0100)]
-add ITS nsigmas in AOD
Julian Book [Wed, 11 Dec 2013 13:54:52 +0000 (14:54 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Julian Book [Wed, 11 Dec 2013 13:53:10 +0000 (14:53 +0100)]
Merge branch 'workdir'
rbertens [Wed, 11 Dec 2013 13:51:35 +0000 (14:51 +0100)]
changes confusing histo names
Julian Book [Wed, 11 Dec 2013 13:51:19 +0000 (14:51 +0100)]
-add its signal AOD
Michal Broz [Wed, 11 Dec 2013 12:23:50 +0000 (13:23 +0100)]
Another histos for lumi
Michal Broz [Wed, 11 Dec 2013 12:21:22 +0000 (13:21 +0100)]
Revert "Another histos for lumi"
This reverts commit
353d9181dc4e95b72480dcce726e4604436c98ad .
Michal Broz [Wed, 11 Dec 2013 12:15:10 +0000 (13:15 +0100)]
Another histos for lumi
mverweij [Wed, 11 Dec 2013 08:49:26 +0000 (09:49 +0100)]
use extrapolation fct of AliEMCALRecoUtils
Redmer Alexander Bertens [Wed, 11 Dec 2013 10:09:14 +0000 (11:09 +0100)]
From Carlos Perez: updates to Strange Flow task and AddTask macro.
From Redmer: minor modifications to unfolding routines
tkollegg [Tue, 10 Dec 2013 20:28:34 +0000 (21:28 +0100)]
necessary fix in MUON
Andrei Gheata [Wed, 11 Dec 2013 09:37:16 +0000 (10:37 +0100)]
Added generator libs in the merging macro
Andrei Gheata [Wed, 11 Dec 2013 09:20:55 +0000 (10:20 +0100)]
JDL bug fix
Ruben Shahoyan [Wed, 11 Dec 2013 09:20:31 +0000 (10:20 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Ruben Shahoyan [Wed, 11 Dec 2013 09:19:13 +0000 (10:19 +0100)]
Set default cut on DCA to 10 sigma
mverweij [Wed, 11 Dec 2013 06:58:59 +0000 (07:58 +0100)]
adjust jet preparation
Andrei Gheata [Wed, 11 Dec 2013 08:22:28 +0000 (09:22 +0100)]
Fix in the merge JDL generation and minor correction for branch loading
Alexandru Bercuci [Wed, 11 Dec 2013 07:55:11 +0000 (09:55 +0200)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Alexandru Bercuci [Wed, 11 Dec 2013 07:52:26 +0000 (09:52 +0200)]
Fix coverity issues
tkollegg [Tue, 10 Dec 2013 20:25:44 +0000 (21:25 +0100)]
Fixes for compile issues in HLT branch with clang 5.0/C++11 (savannah #103408).
Constantin Loizides [Tue, 10 Dec 2013 20:33:38 +0000 (21:33 +0100)]
Fluctuations work that started on svn. Not done but before I loose it again...
Andreas Morsch [Tue, 10 Dec 2013 20:08:52 +0000 (21:08 +0100)]
typo corrected
Andreas Morsch [Tue, 10 Dec 2013 19:43:09 +0000 (20:43 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Constantin Loizides [Mon, 9 Dec 2013 20:28:01 +0000 (21:28 +0100)]
Added is IsExtrapolatedToEMCAL() fct
gconesab [Tue, 10 Dec 2013 17:12:12 +0000 (18:12 +0100)]
Fix previous commit
mweber [Tue, 10 Dec 2013 16:47:32 +0000 (17:47 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Mateusz Ploskon [Tue, 10 Dec 2013 16:31:06 +0000 (17:31 +0100)]
From Constantin.
Massimo Masera [Tue, 10 Dec 2013 16:04:53 +0000 (17:04 +0100)]
Updated treatment of track labels (Ruben)
Leonardo Milano [Tue, 10 Dec 2013 14:52:59 +0000 (15:52 +0100)]
coverity fix
Thorsten Kollegger [Tue, 10 Dec 2013 12:57:27 +0000 (13:57 +0100)]
Better handling of empty fastjet environment (savannah #102985).
Zaida Conesa del Valle [Tue, 10 Dec 2013 12:58:48 +0000 (13:58 +0100)]
Draw track and event selection histograms superimposed (C.Bianchin, A.M.Veen)
Julian Book [Tue, 10 Dec 2013 12:42:33 +0000 (13:42 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Julian Book [Tue, 10 Dec 2013 12:36:53 +0000 (13:36 +0100)]
Merge branch 'workdir'
Julian Book [Tue, 10 Dec 2013 12:32:52 +0000 (13:32 +0100)]
-dca pair
Andrei Gheata [Tue, 10 Dec 2013 12:28:40 +0000 (13:28 +0100)]
Fix for input files for MC loop
Jan Fiete Grosse-Oetringhaus [Tue, 10 Dec 2013 10:36:35 +0000 (11:36 +0100)]
adding shared cluster cut to defaults
fixed bug in mixed event normalization
improving mixed event normalization in case two track cut is used (step 6 is used to determine factor for correction of step8)
Constantin Loizides [Mon, 9 Dec 2013 22:36:17 +0000 (23:36 +0100)]
Implemented propagation on AOD level.
Constantin Loizides [Mon, 9 Dec 2013 21:14:27 +0000 (22:14 +0100)]
Renamed PWG/EMCAL/AliEmcalEsdTpcTrackTask.cxx -> PWG/EMCAL/AliEmcalEsdTrackFilterTask.cxx
and implemented track propagation from new static function in reco utils.
Constantin Loizides [Mon, 9 Dec 2013 21:30:01 +0000 (22:30 +0100)]
fix for missing delete
mverweij [Mon, 9 Dec 2013 21:02:38 +0000 (22:02 +0100)]
delete trackParam
Constantin Loizides [Mon, 9 Dec 2013 20:21:10 +0000 (21:21 +0100)]
Added static AliEMCALRecoUtils::ExtrapolateTrackToEMCalSurface function that operates on esd or aod tracks
Marco van Leeuwen [Mon, 9 Dec 2013 19:38:05 +0000 (20:38 +0100)]
Updates from Chris
Jens Wiechula [Fri, 6 Dec 2013 19:37:45 +0000 (20:37 +0100)]
- Removed AliFatal if multiplicity correction is enabled for AODs - For consistency ESDs <-> AODs: Event multiplicity set to event->GetNumberOfESDtracks() (was event->GetNumberOfTracks()) - Error message if multiplicity cannot be set (is the case for old AODs), i.e. numESDtracks < 0, and multiplicity correction enabled - Enabled multiplicity correction per default (since the only available correction so far is for 2013 pPb periods, it will automatically be switched off for all other periods). NOTE: The correction should not be disabled! Otherwise, the splines can be off! - If multiplicity correction is enabled, print parameters - Commented mult correction for 10h.pass2, such that mult correction is disabled (needs further development and should NOT be used right now) - If mult correction parameters are available, but correction is disabled, print warning (this case should be avoided! Splines might be off) - Adapted splines and maps for 13{b-d}
(Benjamin)
Dhevan Raja Gangadharan [Mon, 9 Dec 2013 15:09:18 +0000 (16:09 +0100)]
Pile-up cuts added, Purity histos added
Friederike Bock [Mon, 9 Dec 2013 14:42:42 +0000 (15:42 +0100)]
added opening angle plot & removed rotating to same eventplane for standard cut
Marco van Leeuwen [Mon, 9 Dec 2013 13:58:09 +0000 (14:58 +0100)]
Change trigger selection logic to include overlaps between J1 and J2 (from Marta)
Christian Holm Christensen [Mon, 9 Dec 2013 13:52:35 +0000 (14:52 +0100)]
Fixes for Git
Christian Holm Christensen [Mon, 9 Dec 2013 13:39:43 +0000 (14:39 +0100)]
- Update some documentation
- Fixed some minor issues in AliBaseESDTask
- Enable selective loading of branches in AliBaseESDTask
- Allow sub-classes of AliBaseESDTask that do not need
corrections
- Fix branch names in AliCopyHeader
- Diagnostics of outliers in AliFMDDensityCalculator
- Ignore rings marked earlier in AliFMDHistCollector
- Ignore events with too many outliers in AliForwardMultiplicityBase
- Better check for Physics selection in AliFMDEventInspector
- Better centrality limits in AliFMDEventInspector
- Diagnostics of missing centrality
- Added histogram of input in AliFMDSharingFilter
- Fix for git revision numbers and branches in AliForwardUtil
- Added possibility to copy an entry of AliOADBForward::Tree
- Fixed up drawers for new stuff
- Added type casts where needed
Christian Holm Christensen [Mon, 9 Dec 2013 13:38:10 +0000 (14:38 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Christian Holm Christensen [Mon, 9 Dec 2013 13:37:22 +0000 (14:37 +0100)]
Added tasks and trains to investigate time-to-previous event.
Some fixes for the AOD and MultDist trains.
Christian Holm Christensen [Mon, 9 Dec 2013 13:23:31 +0000 (14:23 +0100)]
- Added script to create a local index file (CreateIndex.C)
- Add some meta-data to created file collections
- Rename, rather than remove, bad files
- Use glob pattern for matching
- Enable start offset in Proof and ProofLite
- Add possiblity to specify user set-up script in Proof
(non-homogenious cluster for example)
- Add possibility to define preprocessor flags for runTrain
RaphaelleBailhache [Mon, 9 Dec 2013 12:58:25 +0000 (13:58 +0100)]
TOF label test
Zaida Conesa-del-Valle [Mon, 9 Dec 2013 12:26:55 +0000 (13:26 +0100)]
1) Add default cuts for 2011 PbPb and 2010-pp-DvsMult analysis. 2) Possibility to remove D0 daughters from the primary vertex (A. Grelli)
Constantin Loizides [Mon, 9 Dec 2013 11:59:28 +0000 (12:59 +0100)]
Updates from Marta related to track propagation
- updates for propagation in EsdTPCTrackTask. Now using fRecoUtils for track propagation
- added setters so that user can configure, default reproduces AOD
- TrackPropagator task: added possibility to use global and outer track params for propagation.
- TrackPropagatorAOD: only propagate when not done in ESD filter
Constantin Loizides [Mon, 9 Dec 2013 11:56:21 +0000 (12:56 +0100)]
Update from Marta on her EMCAL user tasks
maszyman [Mon, 9 Dec 2013 11:37:27 +0000 (12:37 +0100)]
updates in Proton Femto train
maszyman [Mon, 9 Dec 2013 11:27:32 +0000 (12:27 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Maciej Szymański [Mon, 9 Dec 2013 11:14:38 +0000 (12:14 +0100)]
updates in Kaon Train
Andrei Gheata [Mon, 9 Dec 2013 10:55:37 +0000 (11:55 +0100)]
Fixes for the MC generator analysis mode
Marco van Leeuwen [Mon, 9 Dec 2013 10:32:21 +0000 (11:32 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Marco van Leeuwen [Mon, 9 Dec 2013 10:31:21 +0000 (11:31 +0100)]
Added switch for noCut, geoCut, nclCut (default ncl threshold 60, but can be set from outside) (from Benjamin)
gconesab [Mon, 9 Dec 2013 10:02:16 +0000 (11:02 +0100)]
Example macro to do comparison between different productions analyzed by the QA train
Leonardo Milano [Mon, 9 Dec 2013 09:33:07 +0000 (10:33 +0100)]
getter for x and y component
Alexandru Bercuci [Mon, 9 Dec 2013 07:33:34 +0000 (09:33 +0200)]
/home/abercuci/usr/AliRoot/REF/.git/COMMIT_EDITMSG
Andreas Morsch [Mon, 9 Dec 2013 01:49:45 +0000 (02:49 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
Andreas Morsch [Mon, 9 Dec 2013 01:48:05 +0000 (02:48 +0100)]
New centrality file containing V0A without inner ring
A. Toia
Svein Lindal [Sun, 8 Dec 2013 23:00:05 +0000 (18:00 -0500)]
update aod track cuts
change track id checking for aods
modified: AliAnalysisTaskdPhi.cxx
modified: AliConversionTrackCuts.cxx
modified: AliConversionTrackCuts.h
Jochen Klein [Wed, 4 Dec 2013 17:09:48 +0000 (18:09 +0100)]
- implement destructor for AliTRDtrapValue
Jochen Klein [Fri, 6 Dec 2013 14:13:47 +0000 (15:13 +0100)]
- reset trigger flags together with other containers
Jochen Klein [Tue, 3 Dec 2013 07:43:21 +0000 (08:43 +0100)]
fixes for GTU simulation
- writing tracks to TClonesArray instead of ownership by list
- clean up storage of tracks
- add error messages to AliTRDtrackGTU
Jan Fiete Grosse-Oetringhaus [Fri, 6 Dec 2013 16:46:01 +0000 (17:46 +0100)]
adding steering macros for MC on the fly generation on LEGO trains
Constantin Loizides [Sun, 8 Dec 2013 05:56:48 +0000 (06:56 +0100)]
Use event initmagfield and cleanup of indent
Constantin Loizides [Sun, 8 Dec 2013 05:55:46 +0000 (06:55 +0100)]
Propagation on AOD (Marta)
Constantin Loizides [Sun, 8 Dec 2013 05:53:11 +0000 (06:53 +0100)]
Propagation on AOD (Marta)