Refactoring of the EMCAL jet package:

======================================================================
Move all tasks related to the charged particle analysis in EMCAL
triggered events to a new directory tracks

diff --git a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
index 56118806b24f4a93c26f5c5e002971e6bf9720bd..bdf8bd3d539b77d76963d843744753a4899623bf 100644 (file)
--- a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
+++ b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
@@ -96,24 +96,24 @@ set ( SRCS
  EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskTriggerRejection.cxx
  EMCALJetTasks/UserTasks/AliEmcalPicoTrackFromJetMaker.cxx
- EMCALJetTasks/UserTasks/AliCutValueRange.cxx 
- EMCALJetTasks/UserTasks/AliEMCalHistoContainer.cxx 
- EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx 
- EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.cxx
- EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
- EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerEventData.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerBinningComponent.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.cxx
- EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.cxx
- EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.cxx
+ EMCALJetTasks/Tracks/AliCutValueRange.cxx 
+ EMCALJetTasks/Tracks/AliEMCalHistoContainer.cxx 
+ EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.cxx 
+ EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.cxx
+ EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
+ EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerEventData.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerBinningComponent.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.cxx
+ EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
+ EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalTriggerTreeWriter.cxx
 )
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.cxx
index c8a4ffa6eb6cd0ea9719371189caf8067c696e35..2d954bd0fb26d867d3a88fdbc91b064691f225a0 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -51,16 +51,16 @@
 
 #include "AliClusterContainer.h"
 #include "AliEmcalJet.h"
-#include "AliEmcalPhysicsSelection.h"
 #include "AliEmcalTriggerPatchInfo.h"
+#include "AliEmcalPhysicsSelection.h"
+#include "AliAnalysisTaskPtEMCalTrigger.h"
 #include "AliEMCalHistoContainer.h"
 #include "AliEMCalPtTaskVTrackSelection.h"
-#include "AliEMCalPtTaskTrackSelectionAOD.h"
 #include "AliEMCalPtTaskTrackSelectionESD.h"
+#include "AliEMCalPtTaskTrackSelectionAOD.h"
 #include "AliJetContainer.h"
 #include "AliParticleContainer.h"
 #include "AliPicoTrack.h"
-#include "AliAnalysisTaskPtEMCalTrigger.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliAnalysisTaskPtEMCalTrigger)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.h
similarity index 98%
rename from PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
rename to PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.h
index 7b4c7950797548a293db996ac0f9f0a29f468f1c..604ec8b2320b393a80c3bd9d7d85dc3b8004c425 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTrigger.h
@@ -1,15 +1,15 @@
 #ifndef ALIANALYSISTASKPTEMCALTRIGGER_H_
 #define ALIANALYSISTASKPTEMCALTRIGGER_H_
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel
 
 #include "AliAnalysisTaskEmcalJet.h"
-#include "AliCutValueRange.h"
 #include "AliESDtrackCuts.h"
 #include <TClonesArray.h>
 #include <TList.h>
+#include "AliCutValueRange.h"
 
 class TArrayD;
 class Axis;

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.cxx b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
index 5131e467f0f0afa60cfb5cb5bdb9824dcb95f49f..acfe2592abf9dc40851cfb4340708b570859eab1 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
@@ -20,16 +20,16 @@
  *
  *   Author: Markus Fasel
  */
-#include "AliJetContainer.h"
-#include "AliParticleContainer.h"
 #include "AliInputEventHandler.h"
-#include "AliVEvent.h"
+#include "AliParticleContainer.h"
+#include "AliJetContainer.h"
 
-#include "AliEMCalTriggerAnaTriggerDecision.h"
 #include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerBinningFactory.h"
 #include "AliEMCalTriggerEventData.h"
 #include "AliEMCalTriggerTaskGroup.h"
+#include "AliEMCalTriggerAnaTriggerDecision.h"
+#include "AliEMCalHistoContainer.h"
 #include "AliAnalysisTaskPtEMCalTriggerV1.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliAnalysisTaskPtEMCalTriggerV1)

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.h b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTriggerV1.h
rename to PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.cxx b/PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.cxx
similarity index 98%
rename from PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.cxx
index 74d630c5b86fa369e12ff752256fcf734c6a9ced..3e7cc63d6de1697d61074db896f767e5cada308f 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.h b/PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.h
similarity index 94%
rename from PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.h
rename to PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.h
index 95a833b51f208682902e3916a51ecd81ceaf7d9a..d732d1dafcd5296748d9a3d742a49f7bea8e3429 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliCutValueRange.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliCutValueRange.h
@@ -1,6 +1,6 @@
 #ifndef ALICUTVALUERANGE_H
 #define ALICUTVALUERANGE_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.cxx
index 0741e3ae39792cfd5a3bf4e2f5e00bbeff4a9886..47884141178e70ffd3bc4151ab3bfe92e26b0016 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -38,11 +38,11 @@
 #include <THashList.h>
 #include <TObjArray.h>
 #include <TObjString.h>
+#include "AliEMCalHistoContainer.h"
 #include <TString.h>
 
 #include "AliLog.h"
 
-#include "AliEMCalHistoContainer.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalHistoContainer)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.h
similarity index 98%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.h
index d0557ab6eea9f620da7d85b17d4319273a9dd945..39f9b6aac8272b956007694c690cd99e2bc52edf 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalHistoContainer.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalHistoContainer.h
@@ -1,6 +1,6 @@
 #ifndef ALIEMCALHISTOCONTAINER_H
 #define ALIEMCALHISTOCONTAINER_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.cxx
similarity index 98%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.cxx
index 955c893f7d7f2345c80fe0ca4b8fba31fceebf38..cdb76b574efd6fdd25f32781c8304c7ea73fea2c 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -28,7 +28,7 @@
 #include <AliAODTrack.h>
 #include <AliESDtrack.h>
 #include <AliPicoTrack.h>
-#include <AliEMCalPtTaskTrackSelectionAOD.h>
+#include "AliEMCalPtTaskTrackSelectionAOD.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalPtTaskTrackSelectionAOD)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.h
similarity index 90%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.h
index 4d329f5e93de95c5bff6e5959ae461376a2e7690..706d43a5528942fd290d10aa3c03aba3fc4315fc 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionAOD.h
@@ -1,12 +1,12 @@
 #ifndef ALIEMCALPTTRACKSELECTIONAOD_H_
 #define ALIEMCALPTTRACKSELECTIONAOD_H_
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel
 
-#include <AliEMCalPtTaskVTrackSelection.h>
-#include <AliESDtrackCuts.h>
+#include "AliESDtrackCuts.h"
+#include "AliEMCalPtTaskVTrackSelection.h"
 
 class AliVTrack;
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
similarity index 98%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
index e153068650c6c3b3ef95394e7f2074149f6e06bf..7059b9ddae8ed7fbd71cd14dfbc92c7eb0314185 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -20,6 +20,7 @@
  *             Markus Fasel
  */
 #include <TClonesArray.h>
+#include "AliEMCalPtTaskTrackSelectionESD.h"
 #include <memory>
 
 #include "AliESDEvent.h"
@@ -28,7 +29,6 @@
 #include "AliLog.h"
 #include "AliPicoTrack.h"
 
-#include <AliEMCalPtTaskTrackSelectionESD.h>
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalPtTaskTrackSelectionESD)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.h
similarity index 92%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.h
index 9c7de968127a83e2316a740b0d5b37cb02d23dc3..3150cfd52e54797956a9fea4d7d29d2a997c5c92 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.h
@@ -1,12 +1,12 @@
 #ifndef ALIEMCALPTTASKTRACKSELECTIONESD_H_
 #define ALIEMCALPTTASKTRACKSELECTIONESD_H_
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel
 
-#include <AliEMCalPtTaskVTrackSelection.h>
 #include <AliESDtrackCuts.h>
+#include "AliEMCalPtTaskVTrackSelection.h"
 
 class AliVTrack;
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.cxx
similarity index 95%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.cxx
index 12b7b84acf49938ea1a0e22a95034f2412518a6c..ae8d12011ab5fd208381c58577b074fb2f7195fd 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -20,7 +20,7 @@
  *             Markus Fasel
  */
 #include <TObjArray.h>
-#include <AliEMCalPtTaskVTrackSelection.h>
+#include "AliEMCalPtTaskVTrackSelection.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalPtTaskVTrackSelection)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.h
similarity index 94%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.h
index 3212495333dc3e032d7be213d9a5bb1db6d985dc..6ad16b896d1d2fdb0bbff512e7321c3584341f86 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskVTrackSelection.h
@@ -1,6 +1,6 @@
 #ifndef ALIEMCALPTTASKVTRACKSELECTION_H_
 #define ALIEMCALPTTASKVTRACKSELECTION_H_
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 // Author: Markus Fasel

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.cxx
similarity index 71%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.cxx
index 71e924ca707657b3aca1fbd1a3bc76cf82557fb8..e777f7c3bee49f8678ae57fb3bd64e5e1179e5a3 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.cxx
@@ -1,8 +1,26 @@
+/**************************************************************************
+ * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+/*
+ * Class performing the selection of triggered events
+ *
+ * Author:
+ *    Markus Fasel
+ */
 #include <TClonesArray.h>
 #include <TString.h>
-
 #include "AliVEvent.h"
-
 #include "AliEmcalTriggerPatchInfo.h"
 #include "AliEMCalTriggerAnaTriggerDecision.h"
 #include "AliEMCalTriggerEventData.h"

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.h
similarity index 87%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.h
index bf94de5859b7a2fdff0a2f3124167e0a04bfae30..a1f050e71e8036d2009ae3f6ac8f0a5cbc0f1cbf 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerAnaTriggerDecision.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerAnaTriggerDecision.h
@@ -1,5 +1,10 @@
 #ifndef ALIEMCALTRIGGERANATRIGGERDECISION_H
 #define ALIEMCALTRIGGERANATRIGGERDECISION_H
+/* Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+// Author: Markus Fasel
+#include <TObject.h>
 
 class TClonesArray;
 class TString;

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningComponent.cxx
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningComponent.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningComponent.cxx

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningComponent.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningComponent.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningComponent.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningComponent.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.cxx
index b9c631a3c0a8c9aaf6c1341fbed5cdaf7db2731d..b0f06b92e61769606750719d2eeabeb43f7ecab8 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.cxx
@@ -18,14 +18,12 @@
  *
  *   Author: Markus Fasel
  */
-#include <map>
-#include <vector>
-
-#include "TArrayD.h"
-#include "TMath.h"
-
 #include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerBinningFactory.h"
+#include <map>
+#include <vector>
+#include <TMath.h>
+#include <TArrayD.h>
 
 namespace EMCalTriggerPtAnalysis {
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerBinningFactory.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerBinningFactory.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
index 967194898f5e0f2d0e84ca4a33fc6d95bf0483bb..ada1e8613d245f20e3831bb9a6a5bfe80c838d9f 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
@@ -21,18 +21,19 @@
 #include <string>
 #include <vector>
 
+#include <TAxis.h>
 #include <TClonesArray.h>
 #include <TLorentzVector.h>
 
 #include "AliVCluster.h"
 #include "AliVEvent.h"
 
-#include "AliEMCalHistoContainer.h"
-#include "AliEMCalTriggerAnaTriggerDecision.h"
 #include "AliEMCalTriggerBinningComponent.h"
+#include "AliEMCalTriggerAnaTriggerDecision.h"
 #include "AliEMCalTriggerEventData.h"
 #include "AliEMCalTriggerClusterAnalysisComponent.h"
 
+
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalTriggerClusterAnalysisComponent)
 
 namespace EMCalTriggerPtAnalysis {

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerClusterAnalysisComponent.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventData.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventData.cxx
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventData.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventData.cxx

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventData.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventData.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventData.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventData.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.cxx
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.cxx
index 401375e6c731a5be4c21663cf82c77bc80e28d4f..ed460b5849902cfe3d20322eb20d9e2cf38b25b7 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.cxx
@@ -18,10 +18,10 @@
  *
  *   Author: Markus Fasel
  */
+#include "AliEMCalTriggerEventSelection.h"
+#include "AliEMCalTriggerEventData.h"
 #include <TString.h>
 #include "AliAnalysisUtils.h"
-#include "AliEMCalTriggerEventData.h"
-#include "AliEMCalTriggerEventSelection.h"
 #include "AliVEvent.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalTriggerEventSelection)

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerEventSelection.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerEventSelection.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
index 1751db88a5b2ed78dd05574896b5f50ff81a0faa..d82d425c06d92de8612c60c053f87d345f30e02b 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
@@ -18,8 +18,8 @@
  *   Author: Markus Fasel
  */
 #include <TMath.h>
-#include "AliVParticle.h"
 #include "AliEMCalTriggerKineCuts.h"
+#include "AliVParticle.h"
 
 namespace EMCalTriggerPtAnalysis {
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerKineCuts.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
index 52d0201a43ad184367a8eaf5902cb5ad3d809a0a..3ab7f6bb85ef598c9c97ddc14c80df385e09e05e 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.cxx
@@ -26,12 +26,13 @@
 #include "AliVEvent.h"
 #include "AliVVertex.h"
 
-#include "AliEMCalHistoContainer.h"
 #include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerEventData.h"
 #include "AliEMCalTriggerKineCuts.h"
+#include "AliEMCalTriggerEventData.h"
 #include "AliEMCalTriggerMCParticleAnalysisComponent.h"
 
+
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalTriggerMCParticleAnalysisComponent)
 
 namespace EMCalTriggerPtAnalysis {

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerMCParticleAnalysisComponent.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerMCParticleAnalysisComponent.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
index 79635b50a4480c32dac6ec74ab7c8bd619bf1b82..3e13fccdb309302def0d42601724c128ba5c309e 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
@@ -22,6 +22,7 @@
 #include <string>
 #include <vector>
 
+#include <TAxis.h>
 #include <TClonesArray.h>
 #include <TMath.h>
 #include <TString.h>
@@ -31,10 +32,9 @@
 #include "AliVEvent.h"
 #include "AliVParticle.h"
 #include "AliVTrack.h"
-#include "AliVVertex.h"
 
-#include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerAnaTriggerDecision.h"
+#include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerEventData.h"
 #include "AliEMCalTriggerKineCuts.h"
 #include "AliEMCalPtTaskVTrackSelection.h"

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.h
similarity index 96%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.h
index 731b5798b2f6cb4aefac709073fbb7dc4f5a967b..216ee9a678b7c2fb416876d04d1b0040fa92e9c9 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerRecTrackAnalysisComponent.h
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.h
@@ -5,7 +5,7 @@
 
 // Author: Markus Fasel
 
-#include "AliEMCalTriggerTracksAnalysisComponent.h"
+#include <Tracks/AliEMCalTriggerTracksAnalysisComponent.h>
 
 class TString;
 class AliVParticle;

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.cxx
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.cxx
index 79eae046086ec31b975a7f35edf5eead611b3542..14020f9aa5974f585ca74777023a6f75726d68e8 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.cxx
@@ -21,9 +21,9 @@
  */
 #include <THashList.h>
 #include <TList.h>
-
 #include "AliEMCalTriggerTracksAnalysisComponent.h"
 #include "AliEMCalTriggerEventSelection.h"
+
 #include "AliEMCalTriggerTaskGroup.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalTriggerTaskGroup)

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTaskGroup.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTaskGroup.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.cxx
similarity index 99%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.cxx
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.cxx
index 6cc0d6d65a34cb62291615882255e0feff35b9e3..17c0069690dffd1ac615c6be22be53f996a0f2c2 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.cxx
@@ -19,10 +19,9 @@
  *   Author: Markus Fasel
  */
 #include <TAxis.h>
-
-#include "AliEMCalTriggerAnaTriggerDecision.h"
-#include "AliEMCalTriggerBinningComponent.h"
 #include "AliEMCalTriggerTracksAnalysisComponent.h"
+#include "AliEMCalTriggerBinningComponent.h"
+#include "AliEMCalTriggerAnaTriggerDecision.h"
 
 ClassImp(EMCalTriggerPtAnalysis::AliEMCalTriggerTracksAnalysisComponent)
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.h b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.h
similarity index 100%
rename from PWGJE/EMCALJetTasks/UserTasks/AliEMCalTriggerTracksAnalysisComponent.h
rename to PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerTracksAnalysisComponent.h

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalTriggerTreeWriter.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalTriggerTreeWriter.C
index 5438ae490049a34d631198a9192db9c9515158c3..7c0b159b7e84b3daa2e460962a7d0f0d616f502c 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalTriggerTreeWriter.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalTriggerTreeWriter.C
@@ -1,6 +1,7 @@
+
 #if !defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
-#include "AliAnalysisTaskPtEMCalTrigger.h"
+#include <Tracks/AliAnalysisTaskPtEMCalTrigger.h>
 #include "AliESDtrackCuts.h"
 #include <TList.h>
 #include <TString.h>

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskPtEMCalTrigger.C b/PWGJE/EMCALJetTasks/macros/AddTaskPtEMCalTrigger.C
index be235c3b3d714bb88cb2618a045e25e29ebe063b..cdf472080e923c1dd502100527df8f580d25b4e5 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskPtEMCalTrigger.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskPtEMCalTrigger.C
@@ -1,6 +1,7 @@
+
 #if !defined (__CINT__) || defined (__MAKECINT__)
 #include "AliAnalysisManager.h"
-#include "AliAnalysisTaskPtEMCalTrigger.h"
+#include <Tracks/AliAnalysisTaskPtEMCalTrigger.h>
 #include "AliESDtrackCuts.h"
 #include "AliJetContainer.h"
 #include <TList.h>