Fix for addtask macros and new baseclasses (from Redmer)
authormvl <mvl@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 17 Oct 2013 18:04:55 +0000 (18:04 +0000)
committermvl <mvl@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 17 Oct 2013 18:04:55 +0000 (18:04 +0000)
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetMatching.cxx
PWGJE/EMCALJetTasks/macros/AddTaskJetMatching.C
PWGJE/EMCALJetTasks/macros/AddTaskLocalRho.C
PWGJE/EMCALJetTasks/macros/AddTaskRhoVnModulation.C

index 5d8eb76b2b62658c759b7b51335fa8bf18bfad6c..c996d71681b33e6ddb6489102af550ded647b03c 100644 (file)
@@ -128,7 +128,7 @@ void AliAnalysisTaskJetMatching::UserCreateOutputObjects()
     fHistMatchedSourceJetPt = (fDoDetectorResponse) ? BookTH1F("fHistMatchedParticleLevelJetPt", "p_{t}^{gen} [GeV/c]", 150, -50, 250) : BookTH1F("fHistMatchedSourceJetPt", "p_{t} [GeV/c]", 150, -50, 250);
     fHistTargetJetPt = BookTH1F("fHistTargetJetPt", "p_{t} [GeV/c]", 150, -50, 250);
     fHistMatchedJetPt = (fDoDetectorResponse) ? BookTH1F("fHistDetectorLevelJet", "p_{t}^{rec}", 150, -50, 250) : BookTH1F("fHistMatchedJetPt", "p_{t} [GeV/c]", 150, -50, 250);
-    fHistSourceMatchedJetPt = (fDoDetectorResponse) ? BookTH2F("fHistPartDetJetPt", "particle level jet p_{t}^{gen} [GeV/c]", "detector level jet p_{t}^{rec} [GeV/c]", 150, -50, 250, 150, -50, 250) : BookTH2F("fHistSourceMatchedJetPt", "source jet p_{t} [GeV/c]", "matched jet p_{t} [GeV/c]", 150, -50, 250, 150, -50, 250);
+    fHistSourceMatchedJetPt = (fDoDetectorResponse) ? BookTH2F("fHistPartDetJetPt", "particle level jet p_{t}^{gen} [GeV/c]", "detector level jet p_{t}^{rec} [GeV/c]", 300, -50, 250, 300, -50, 250) : BookTH2F("fHistSourceMatchedJetPt", "source jet p_{t} [GeV/c]", "matched jet p_{t} [GeV/c]", 300, -50, 250, 300, -50, 250);
     fHistNoConstSourceJet = BookTH1F("fHistNoConstSourceJet", "number of constituents", 50, 0, 50);
     fHistNoConstTargetJet = BookTH1F("fHistNoConstTargetJet", "number of constituents", 50, 0, 50);
     fHistNoConstMatchJet = BookTH1F("fHistNoConstMatchJet", "number of constituents", 50, 0, 50);
index 66d0bcc4f30ee4799b6d488d734b1d573b72a1f1..8e2bb2e7e1e18101925b7765be9094812dabf875 100644 (file)
@@ -12,11 +12,11 @@ AliAnalysisTaskJetMatching* AddTaskJetMatching(
         Float_t minFrReConPt    = .5,
         const char *name        = "AliAnalysisTaskJetMatching",
         Bool_t cut              = kTRUE,
-        UInt_t  sourceType      = AliAnalysisTaskEmcal::kTPC,
+        UInt_t  sourceType      = AliJetContainer::kTPC,
         Float_t sourceRadius    = 0.3,
         Float_t sourceAreaCut   = .557,
         Float_t sourcePtBias    = 10.,
-        UInt_t targetType       = AliAnalysisTaskEmcal::kTPC,
+        UInt_t targetType       = AliJetContainer::kTPC,
         Float_t targetRadius    = 0.3,
         Float_t targetAreaCut   = .557,
         Float_t targetPtBias    = 10.
index 27366f84be8369f75a5940b79c8915914ffff844..a00171f752510300ee7141607c22c01528a3ca77 100644 (file)
@@ -16,7 +16,7 @@ AliAnalysisTaskLocalRho* AddTaskLocalRho(
   Double_t   jetradius          = 0.3,          // jet radius (to remove leading jet)
   Double_t   jetptcut           = 1,            
   Double_t   jetareacut         = 0.557,
-  UInt_t     type               = AliAnalysisTaskEmcal::kTPC,
+  UInt_t     type               = AliJetContainer::kTPC,
   Int_t      leadhadtype        = 0,
   const char *name              = "AliAnalysisTaskLocalRho",    // task name
   TString    fitOpts            = "WLQI",                       // options for tfitter
index 2555dd6ed764689f41bd042aa22c51f9d3089c50..efb0c9d5e2e01e09889a4f2e6259b1e435215d7c 100644 (file)
@@ -57,11 +57,11 @@ AliAnalysisTaskRhoVnModulation* AddTaskRhoVnModulation(
     name += "_";
     name += nrho;
   }
-  if (type == AliAnalysisTaskEmcal::kTPC) 
+  if (!strcmp(type, "TPC"))
     name += "_TPC";
-  else if (type == AliAnalysisTaskEmcal::kEMCAL) 
+  else if (!strcmp(type, "EMCAL"))
     name += "_EMCAL";
-  else if (type == AliAnalysisTaskEmcal::kUser
+  else if (!strcmp(type, "USER")
     name += "_USER";
 
   AliAnalysisTaskRhoVnModulation* jetTask = new AliAnalysisTaskRhoVnModulation(name, runMode);