]>
git.uio.no Git - u/mrichter/AliRoot.git/log
shahoian [Fri, 14 Mar 2014 20:59:10 +0000 (21:59 +0100)]
Merge branch 'master' into dev
shahoian [Fri, 14 Mar 2014 20:51:18 +0000 (21:51 +0100)]
Tracking update
cbianchi [Fri, 14 Mar 2014 17:46:56 +0000 (18:46 +0100)]
fix conflicts and Libs
cbianchi [Fri, 14 Mar 2014 17:16:35 +0000 (18:16 +0100)]
Use std output and MC trigger
morsch [Fri, 14 Mar 2014 19:04:16 +0000 (20:04 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
morsch [Fri, 14 Mar 2014 19:02:34 +0000 (20:02 +0100)]
latest implementation of the Beam Pipe and its support on the side C in view of the ITS+MFT joint upcoming simulation production run
Raphael Tieulent <raphael.tieulent@cern.ch>
rbertens [Fri, 14 Mar 2014 17:10:09 +0000 (18:10 +0100)]
improved efficiency by caching leading jet per event, changed cuts on leading jet to simple jet kinematic variables
mfloris [Fri, 14 Mar 2014 16:30:01 +0000 (17:30 +0100)]
Mapping instance copied of when reading from file + Track Clear
This avoids problems when switching file (the mapping would be deleted).
The AliNanoAODTrack track class now has a Clear method.
mkrzewic [Fri, 14 Mar 2014 16:12:39 +0000 (17:12 +0100)]
hack the alien env to make it work in all cases
mkrzewic [Fri, 14 Mar 2014 16:09:21 +0000 (17:09 +0100)]
make the script working
miweber [Fri, 14 Mar 2014 14:33:52 +0000 (15:33 +0100)]
changes to run on nano AODs (temporary)
miweber [Fri, 14 Mar 2014 11:52:59 +0000 (12:52 +0100)]
first changes to run on nano AODs (temporary)
jklein [Fri, 14 Mar 2014 14:24:49 +0000 (15:24 +0100)]
- store b and c from on-line track to AliESDTrdTrack
rgrosso [Fri, 14 Mar 2014 13:16:01 +0000 (14:16 +0100)]
Force caching of the CMAKE_INSTALL_DIR variable
Reorder check on ALICE_INSTALL
mkrzewic [Fri, 14 Mar 2014 13:54:59 +0000 (14:54 +0100)]
be explicit about the alien user
gconesab [Fri, 14 Mar 2014 13:08:08 +0000 (14:08 +0100)]
put back also the maximum foreseen ALTRO DDL, not only the number of super modules
ssakai [Fri, 14 Mar 2014 12:46:47 +0000 (13:46 +0100)]
comment printf
hristov [Fri, 14 Mar 2014 12:21:20 +0000 (13:21 +0100)]
Incremented ClassDef
rbertens [Fri, 14 Mar 2014 12:12:21 +0000 (13:12 +0100)]
add bookkeeping of pythia ntrials and cross section for pt hard bins
mkrzewic [Fri, 14 Mar 2014 09:45:59 +0000 (10:45 +0100)]
fix the executable bit
mkrzewic [Fri, 14 Mar 2014 09:31:57 +0000 (10:31 +0100)]
change the logic of creating a softlink - override the old one if exists to provide a link to the most current donwload (for e.g. the LEGO train output
rbailhac [Thu, 13 Mar 2014 22:15:19 +0000 (23:15 +0100)]
Merge branch 'master' of http://git.cern.ch/pub/AliRoot
rbailhac [Thu, 13 Mar 2014 22:14:50 +0000 (23:14 +0100)]
Update
rgrosso [Thu, 13 Mar 2014 21:42:56 +0000 (22:42 +0100)]
Remove TObject::Clone calls (JIRA 4874)
When filling the array of valid file ids, avoid calling
AliCDBId::Clone()
it has unpredictable effects (on SLC6 and with root v4-34-11
it was crashing the mchview executable).
rbailhac [Thu, 13 Mar 2014 21:14:02 +0000 (22:14 +0100)]
Merge branch 'master' of http://git.cern.ch/pub/AliRoot
policheh [Thu, 13 Mar 2014 18:57:07 +0000 (19:57 +0100)]
added AddTask macro for AliAnalysisTaskPi0FlowMCAOD
mkrzewic [Thu, 13 Mar 2014 17:51:55 +0000 (18:51 +0100)]
from Mesut Arslandok: add event gid to filtered trees
mkrzewic [Wed, 12 Mar 2014 15:10:11 +0000 (16:10 +0100)]
small updates, large scale test of this version is running
gconesab [Thu, 13 Mar 2014 17:24:00 +0000 (18:24 +0100)]
fix angle to absId mapping for extensions
hristov [Thu, 13 Mar 2014 17:04:49 +0000 (18:04 +0100)]
Revert "Revert "#103626: Commit DCal geometry to master" since the files are broken."
This reverts commit
7fb33c06ecf4fb24f16367ecdb5a4a4e063cce9b .
gconesab [Thu, 13 Mar 2014 16:27:36 +0000 (17:27 +0100)]
move DCAL automatic geometry setting to runs larger than those of 2013
gconesab [Thu, 13 Mar 2014 16:26:48 +0000 (17:26 +0100)]
cosmetics data members comment indentation
gconesab [Thu, 13 Mar 2014 16:26:16 +0000 (17:26 +0100)]
Increase back the number of SM to 22
ssakai [Thu, 13 Mar 2014 16:19:08 +0000 (17:19 +0100)]
from Yvonne
shahoian [Thu, 13 Mar 2014 16:14:28 +0000 (17:14 +0100)]
Changed hit/match access methods from protected to public
shahoian [Thu, 13 Mar 2014 15:58:05 +0000 (16:58 +0100)]
update from Yvonne
pachmay [Thu, 13 Mar 2014 13:20:11 +0000 (14:20 +0100)]
- fast TRD PID implementation with muon constraints (Daniel Lohner)
zampolli [Thu, 13 Mar 2014 15:30:54 +0000 (16:30 +0100)]
Modification of AddTRD task for calibration (Raphaelle)
to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
rbailhac [Thu, 13 Mar 2014 15:08:34 +0000 (16:08 +0100)]
TRD macro
rbailhac [Thu, 13 Mar 2014 15:09:08 +0000 (16:09 +0100)]
Merge branch 'master' of http://git.cern.ch/pub/AliRoot
rbailhac [Thu, 13 Mar 2014 15:08:34 +0000 (16:08 +0100)]
TRD macro
fbellini [Thu, 13 Mar 2014 14:47:54 +0000 (15:47 +0100)]
Update from Massimo
jbook [Thu, 13 Mar 2014 14:35:32 +0000 (15:35 +0100)]
switch off shriking of tclones array to avoid large virtual memory
hristov [Thu, 13 Mar 2014 13:53:08 +0000 (14:53 +0100)]
Fix if both FASTJET and FASTJET_ROOT are not set
mvl [Wed, 12 Mar 2014 21:58:43 +0000 (22:58 +0100)]
Add FASTJET package definition/finding macro for general use; use FASTJET_FOUND variable to switch on/of FASTJET usage in JETAN and PWGJE
mvl [Wed, 12 Mar 2014 17:06:21 +0000 (18:06 +0100)]
Remove fastjet include files; do not build libFASTJETAN if there is no fastjet on the system
Separate out PWGJE (user)tasks that need fastjet; do not build when fastjet is not present
rbertens [Thu, 13 Mar 2014 14:06:11 +0000 (15:06 +0100)]
added pdet-ppart over ppart histogram for detector response
mkrzewic [Thu, 13 Mar 2014 13:45:12 +0000 (14:45 +0100)]
make it work on lxplus
mcosenti [Thu, 13 Mar 2014 13:28:15 +0000 (10:28 -0300)]
fixing the way the photon is isolated at mc level and adding a TH3 for the mc-truth photons isolated at mc level
rbertens [Thu, 13 Mar 2014 11:17:12 +0000 (12:17 +0100)]
update AddTask macro from Naghmeh
maszyman [Thu, 13 Mar 2014 11:14:05 +0000 (12:14 +0100)]
update for momentum resolution study
ssakai [Thu, 13 Mar 2014 11:04:39 +0000 (12:04 +0100)]
updated for vertex study
shahoian [Thu, 13 Mar 2014 10:23:40 +0000 (11:23 +0100)]
technial fix to suppress the warning
pcrochet [Thu, 13 Mar 2014 09:04:03 +0000 (10:04 +0100)]
Make the option to keep the SPD tracklets in muon AODs accessible after the ctor has been called (Laurent)
pcrochet [Thu, 13 Mar 2014 08:56:29 +0000 (09:56 +0100)]
Coverity fix (Laurent)
mkrzewic [Wed, 12 Mar 2014 23:22:50 +0000 (00:22 +0100)]
dont process if detector container not present in the qa file to avoid overwriting with empty results
fprino [Wed, 12 Mar 2014 22:52:57 +0000 (23:52 +0100)]
Fix (AndreaR)
jklein [Wed, 12 Mar 2014 21:36:39 +0000 (22:36 +0100)]
- remove descriptors and classes with obsolete TRD inputs
jbook [Wed, 12 Mar 2014 21:45:21 +0000 (22:45 +0100)]
set fill map once
jbook [Wed, 12 Mar 2014 21:42:03 +0000 (22:42 +0100)]
avoid overwriting of efficiency maps in multi tasks
rhaake [Wed, 12 Mar 2014 17:22:36 +0000 (18:22 +0100)]
Charged jets(pPb) framework bugfixes
Signed-off-by: loizides <cloizides@lbl.gov>
shahoian [Wed, 12 Mar 2014 17:26:52 +0000 (18:26 +0100)]
Merge branch 'master' into dev
fprino [Wed, 12 Mar 2014 17:18:52 +0000 (18:18 +0100)]
Update in Lc task (ChiaraZ)
shahoian [Wed, 12 Mar 2014 17:16:11 +0000 (18:16 +0100)]
install GlauberMCDist.root and SpectatorSignal.root to /home/shahoian/ALICE/AliRootCurr/ZDC/
fprino [Wed, 12 Mar 2014 17:07:44 +0000 (18:07 +0100)]
Task for Lc->K0s+p with TMVA (Chiara Z.)
shahoian [Wed, 12 Mar 2014 16:22:10 +0000 (17:22 +0100)]
Merge branch 'master' into dev
agrigora [Wed, 12 Mar 2014 16:12:13 +0000 (17:12 +0100)]
Using CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable to check if CMAKE_INSTALL_PREFIX is set
jbook [Wed, 12 Mar 2014 15:56:32 +0000 (16:56 +0100)]
reduce memory internal train by ~0.5
fprino [Wed, 12 Mar 2014 15:01:31 +0000 (16:01 +0100)]
New mehtod for tagging Lc candidates from Hijing generator
mivanov [Wed, 12 Mar 2014 14:55:54 +0000 (15:55 +0100)]
Remove usage of hardwired calibration
agrigora [Wed, 12 Mar 2014 14:48:40 +0000 (15:48 +0100)]
Using CMAKE_INSTALL_PREFIX instead of ALICE_INSTALL if set from configuration
If defined, the installation will use CMAKE_INSTALL_PREFIX, if not it will default to ALICE_INSTALL.
If ALICE_INSTALL is not defined it will default to the source directory ALICE_ROOT
rbailhac [Wed, 12 Mar 2014 14:43:53 +0000 (15:43 +0100)]
Merge branch 'master' of http://git.cern.ch/pub/AliRoot
rbailhac [Wed, 12 Mar 2014 13:36:15 +0000 (14:36 +0100)]
Update of the hfe package from gsi svn
pluettig [Wed, 12 Mar 2014 14:36:02 +0000 (15:36 +0100)]
Added Phi Distribution
AddTask modified to disable length cut
ebruna [Wed, 12 Mar 2014 14:13:45 +0000 (15:13 +0100)]
add p conserv at kine level, flag to speed up the analysis (Fabio C.)
ekryshen [Wed, 12 Mar 2014 13:45:02 +0000 (14:45 +0100)]
Protection against missing MC header
ekryshen [Wed, 12 Mar 2014 13:43:38 +0000 (14:43 +0100)]
Modified input parameters
fbock [Wed, 12 Mar 2014 13:56:08 +0000 (14:56 +0100)]
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
fbock [Wed, 12 Mar 2014 13:55:00 +0000 (14:55 +0100)]
- changes in Dalitztask
- modified cutnumbers for PbPb task
mcosenti [Wed, 12 Mar 2014 13:25:25 +0000 (10:25 -0300)]
rebinning two histograms and removing one printout
sjena [Wed, 12 Mar 2014 12:36:45 +0000 (13:36 +0100)]
Updates from Prabhat
jbook [Wed, 12 Mar 2014 10:25:49 +0000 (11:25 +0100)]
fix
jbook [Wed, 12 Mar 2014 09:40:48 +0000 (10:40 +0100)]
mixing memory updates
hristov [Wed, 12 Mar 2014 09:08:24 +0000 (10:08 +0100)]
Putting some order in the list and number of detectors
mverweij [Wed, 12 Mar 2014 07:57:13 +0000 (08:57 +0100)]
set timing cuts LHC11h
mverweij [Tue, 11 Mar 2014 22:53:56 +0000 (23:53 +0100)]
add exotic cluster remove switch to cluster maker
kharlov [Tue, 11 Mar 2014 19:58:06 +0000 (23:58 +0400)]
New class for MC AOD analysis (B.Polishchuk)
rbertens [Tue, 11 Mar 2014 16:27:43 +0000 (17:27 +0100)]
minor typo fix
sjena [Tue, 11 Mar 2014 16:26:25 +0000 (17:26 +0100)]
Update from DptDpt Correlations task
jgrosseo [Tue, 11 Mar 2014 16:24:32 +0000 (17:24 +0100)]
changed to nanoAOD production; fix in AliAODVertex::CloneWithoutRefts
miweber [Tue, 11 Mar 2014 15:56:34 +0000 (16:56 +0100)]
coverity fix (memory leak in binning array)
mkrzewic [Tue, 11 Mar 2014 15:58:12 +0000 (16:58 +0100)]
update the chain of scirpts/mcros for filtering of raw data
shahoian [Tue, 11 Mar 2014 15:28:56 +0000 (16:28 +0100)]
Disable test of requested CDB objects similarity in sim and rec in case the sim has never requested this object
shahoian [Tue, 11 Mar 2014 15:28:02 +0000 (16:28 +0100)]
Disable test of requested CDB objects similarity in sim and rec in case the sim has never requested this object
shahoian [Tue, 11 Mar 2014 14:52:52 +0000 (15:52 +0100)]
Technical fix in CheckRecoCDBvsSimuCDB
shahoian [Tue, 11 Mar 2014 14:40:54 +0000 (15:40 +0100)]
Technical fix in the CheckRecoCDBvsSimuCDB
mkrzewic [Tue, 11 Mar 2014 14:33:39 +0000 (15:33 +0100)]
remove debug message
mkrzewic [Tue, 11 Mar 2014 14:09:52 +0000 (15:09 +0100)]
remove obsolete option to set aliroot environment, the env has to be set externally
mkrzewic [Tue, 11 Mar 2014 14:06:33 +0000 (15:06 +0100)]
make the update of the period level QA safe (by running in a temp location and only moving after validation)
miweber [Tue, 11 Mar 2014 13:37:55 +0000 (14:37 +0100)]
variable normalization range of the event mixing histograms for correlation functions
before: fixed 1/2*pi < dphi < 3/2*pi
now: pi - dphirange < dphi < pi + dphirange (default: dphirange = 1/6*pi)