Fixing bugs (removing a member from AliSpectraAODTrackCuts.h, added Merge method...

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx
index d4ee35b110adde292239f159efc09828022ce2c8..cc4a7210f17ad44032fb3fd21a6a853358f4a2ac 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx
@@ -12,11 +12,11 @@
 
 ClassImp(AliSpectraAODPID)
 
-AliSpectraAODPID::AliSpectraAODPID() : TObject(), fPIDType(kNSigmaTPCTOF), fNSigmaPID(3), fPIDResponse(0) {
+AliSpectraAODPID::AliSpectraAODPID() : TNamed("PID", "PID object"), fPIDType(kNSigmaTPCTOF), fNSigmaPID(3), fPIDResponse(0) {
 
 }
 
-AliSpectraAODPID::AliSpectraAODPID(AODPIDType_t pidType) : TObject(), fPIDType(pidType), fNSigmaPID(3), fPIDResponse(0) {
+AliSpectraAODPID::AliSpectraAODPID(AODPIDType_t pidType) : TNamed("PID", "PID object"), fPIDType(pidType), fNSigmaPID(3), fPIDResponse(0) {
 
 
 
@@ -168,3 +168,43 @@ Int_t AliSpectraAODPID::GetParticleSpecie(AliAODTrack      * trk, AliSpectraAODT
   return kSpUndefined;
 
 }
+
+Long64_t AliSpectraAODPID::Merge(TCollection* list)
+{
+  // Merging interface.
+  // Returns the number of merged objects (including this).
+
+  Printf("Merging");
+
+  if (!list)
+    return 0;
+
+  if (list->IsEmpty())
+    return 1;
+
+  TIterator* iter = list->MakeIterator();
+  TObject* obj;
+
+  // Actually, we don't do anything here...
+  // collections of all histograms
+  //  TList collections;
+
+  Int_t count = 0;
+
+  while ((obj = iter->Next())) {
+    AliSpectraAODPID* entry = dynamic_cast<AliSpectraAODPID*> (obj);
+    if (entry == 0) 
+      continue;
+
+    // TH1I * histo = entry->GetHistoCuts();      
+    // collections.Add(histo);
+    count++;
+  }
+  
+  //  fHistoCuts->Merge(&collections);
+  
+  delete iter;
+  Printf("OK");
+  return count+1;
+}
+

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h
index 7ed647f6d92e5443628a93ea8e19e739d4fb349e..729cf7d47863b17a5090ac5a94d8ab6ca7c4c79f 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h
@@ -40,7 +40,7 @@ namespace AliSpectraNameSpace {
 
 using namespace AliSpectraNameSpace;
 
-class AliSpectraAODPID : public TObject
+class AliSpectraAODPID : public TNamed
 {
 public:
   AliSpectraAODPID() ;
@@ -53,6 +53,8 @@ public:
   Int_t GetParticleSpecie(AliAODTrack      * trk, AliSpectraAODTrackCuts * trackCuts);
   Int_t GetParticleSpecie(AliAODMCParticle * trk);
   
+  Long64_t Merge(TCollection* list);
+
 
 private:
 

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
index 392469c88f0a9cff5111a9cafdea78a7b8aa0aef..68851ac87308edd4cc5c3e1a4687b8011a478e54 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h
@@ -78,7 +78,6 @@ public:
    Float_t          fPtCutTOFMatching;           // TOF Matching
    Float_t          fQvecCutMin;           // Minimum value of Qvec
    Float_t          fQvecCutMax;           // Minimum value of Qvec
-   AliPIDResponse   *fPIDResponse; // PID response  
    TH1I             *fHistoCuts;       // Cuts statistics
    AliAODTrack      *fTrack;           //! Track pointer
    

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C
index 7837f725a5092ee9bdfdc98ed2d70f04f7ebb54c..cc8a7b476e23a8567c88598a6be84039dfdd8c99 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C
@@ -1,4 +1,4 @@
-#include "AliSpectraAODPID.h" 
+
 
 
 void runAODProof(Int_t c=1, const char * proofMode = "full")
@@ -7,10 +7,10 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
   //3 data AOD086
   //4 MC AOD090
   
-  gEnv->SetValue("XSec.GSI.DelegProxy", "2");
+  //  gEnv->SetValue("XSec.GSI.DelegProxy", "2");
   
   gSystem->Load("libTree.so");
-   gSystem->Load("libGeom.so");
+  gSystem->Load("libGeom.so");
    gSystem->Load("libVMC.so");
    gSystem->Load("libPhysics.so");
    gSystem->Load("libSTEERBase.so");
@@ -21,7 +21,6 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
    gSystem->Load("libANALYSISalice.so");
    gSystem->AddIncludePath("-I$ALICE_ROOT/include");
 
-
    AliAnalysisAlien * handler = new AliAnalysisAlien("test");
    handler->SetOverwriteMode();
    handler->SetRunMode(proofMode);
@@ -30,11 +29,10 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
    //handler->SetAliROOTVersion("v5-03-11-AN");
    handler->SetAliROOTVersion("v5-03-17-AN");
    
-   //handler->SetNproofWorkers(2);
-   handler->SetNproofWorkersPerSlave(1);
+   handler->SetNproofWorkers(10);
+   //     handler->SetNproofWorkersPerSlave(1);
    handler->SetProofCluster(Form("%s@alice-caf.cern.ch", gSystem->Getenv("CAFUSER")));
-   //handler->SetProofCluster(Form("%s@skaf.saske.sk",gSystem->Getenv("CAFUSER")));
-   
+   //   handler->SetProofCluster(Form("%s@skaf.saske.sk",gSystem->Getenv("CAFUSER")));
    // Set handler for Real DATA:
    if (c == 1){
      handler->SetProofDataSet("/alice/data/LHC10h_000138653_p2_AOD049#aodTree");
@@ -55,11 +53,11 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
    gROOT->LoadMacro("AliSpectraAODHistoManager.cxx+g");
    gROOT->LoadMacro("AliSpectraAODPID.cxx+g");
    gROOT->LoadMacro("AliAnalysisTaskSpectraAOD.cxx+g");
-   
+
    handler->SetAliRootMode("default");
    handler->SetAdditionalLibs("AliSpectraAODHistoManager.cxx AliSpectraAODHistoManager.h AliSpectraAODPID.cxx AliSpectraAODPID.h AliSpectraAODEventCuts.cxx AliSpectraAODEventCuts.h AliSpectraAODTrackCuts.cxx AliSpectraAODTrackCuts.h AliAnalysisTaskSpectraAOD.cxx AliAnalysisTaskSpectraAOD.h");
    handler->SetAnalysisSource("Histograms.h HistogramNames.h AliSpectraAODHistoManager.cxx+ AliSpectraAODEventCuts.cxx+ AliSpectraAODTrackCuts.cxx+ AliSpectraAODPID.cxx+ AliAnalysisTaskSpectraAOD.cxx+");
-   handler->SetFileForTestMode("filelist.txt"); // list of local files for testing
+   //   handler->SetFileForTestMode("filelist.txt"); // list of local files for testing
    //  handler->SetAliRootMode("");
    handler->SetClearPackages();
    
@@ -84,7 +82,8 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
    // Double_t CentCutMax[4]={10,20,30,40};
    // Double_t QvecCutMin[4]={0,0,0,0};
    // Double_t QvecCutMax[4]={100,100,100,100};
-   AliSpectraAODPID * pid = new AliSpectraAODPID(AODPIDType_t::kNSigmaTPCTOF);
+   using namespace AliSpectraNameSpace;
+   AliSpectraAODPID *pid = new AliSpectraAODPID(kNSigmaTPCTOF); 
    pid->SetNSigmaCut(5.);
    
    for(Int_t iCut=1;iCut<2;iCut++){
@@ -138,7 +137,7 @@ void runAODProof(Int_t c=1, const char * proofMode = "full")
         AliAnalysisDataContainer *coutputpt3 = mgr->CreateContainer(Form("ctcutpt%d",iCut), AliSpectraAODTrackCuts::Class(),     AliAnalysisManager::kOutputContainer, 
                                                                     Form("Pt.AOD.1._data_ptcut_Cent%.0fto%.0f_QVec%.1fto%.1f.root",CentCutMin[iCut],CentCutMax[iCut],QvecCutMin[iCut],QvecCutMax[iCut]));
         AliAnalysisDataContainer *coutputpt4 = mgr->CreateContainer(Form("cpidpt%d",iCut),  AliSpectraAODPID::Class(),     AliAnalysisManager::kOutputContainer, 
-                                                                    Form("Pt.AOD.1._data_Cent%.0fto%.0f_QVec%.1fto%.1f.root",CentCutMin[iCut],CentCutMax[iCut],QvecCutMin[iCut],QvecCutMax[iCut]));
+                                                                    Form("Pt.AOD.1._data_ptcut_Cent%.0fto%.0f_QVec%.1fto%.1f.root",CentCutMin[iCut],CentCutMax[iCut],QvecCutMin[iCut],QvecCutMax[iCut]));
         
        }
      mgr->ConnectInput(task, 0, cinput);