Remove class AliAnaCaloTriggerMC, not needed

diff --git a/PWG4/CMake_libPWG4PartCorrDep.txt b/PWG4/CMake_libPWG4PartCorrDep.txt
index fbb4f66e0541bbbd9d5d3c5c4d23af85cfdaf804..a1210c1fac0e52e0a57c857b93113313c0a95ed7 100755 (executable)
--- a/PWG4/CMake_libPWG4PartCorrDep.txt
+++ b/PWG4/CMake_libPWG4PartCorrDep.txt
@@ -1,7 +1,7 @@
 # -*- mode: cmake -*-
 
 set(SRCS
-       PartCorrDep/AliAnaCaloTrigger.cxx PartCorrDep/AliAnaCaloTriggerMC.cxx
+       PartCorrDep/AliAnaCaloTrigger.cxx
        PartCorrDep/AliAnalysisTaskPHOSExample.cxx PartCorrDep/AliAnaExample.cxx
        PartCorrDep/AliAnaPhoton.cxx PartCorrDep/AliAnaPi0.cxx PartCorrDep/AliAnaPi0EbE.cxx 
        PartCorrDep/AliAnaParticleIsolation.cxx PartCorrDep/AliAnaParticlePartonCorrelation.cxx 

diff --git a/PWG4/PWG4PartCorrDepLinkDef.h b/PWG4/PWG4PartCorrDepLinkDef.h
index 90ffaa9ee9bfec3bd288ad8070967bf6ee3de7d2..de652150388433d83f545d1aa01013328a43ffdb 100755 (executable)
--- a/PWG4/PWG4PartCorrDepLinkDef.h
+++ b/PWG4/PWG4PartCorrDepLinkDef.h
@@ -5,7 +5,6 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliAnaCaloTrigger+;
-#pragma link C++ class AliAnaCaloTriggerMC+;
 #pragma link C++ class AliAnalysisTaskPHOSExample+;
 #pragma link C++ class AliAnaExample+;
 #pragma link C++ class AliAnaPhoton+;

diff --git a/PWG4/PartCorrDep/AliAnaCaloTriggerMC.cxx b/PWG4/PartCorrDep/AliAnaCaloTriggerMC.cxx
deleted file mode 100755 (executable)
index 277624c..0000000
--- a/PWG4/PartCorrDep/AliAnaCaloTriggerMC.cxx
+++ /dev/null
@@ -1,283 +0,0 @@
-
-/**************************************************************************
- * Copyright(c) 1998-1999, 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.                  *
- **************************************************************************/
-
-//_________________________________________________________________________
-// An analysis task to check the trigger data in ESD with MC data
-// Creates an ntuple for 2x2 and NxN triggers
-// Each ntuple connects the maximum trigger amplitudes 
-// and its positions with reconstructed clusters and MC 
-//
-//*-- Yves Schutz (CERN) & Gustavo Conesa Balbastre (INFN-LNF)
-//////////////////////////////////////////////////////////////////////////////
-
-#include <TChain.h>
-#include <TFile.h> 
-#include <TNtuple.h>
-#include <TVector3.h> 
-
-#include "AliAnalysisManager.h"
-#include "AliMCEventHandler.h"
-#include "AliMCEvent.h"
-#include "AliAnaCaloTriggerMC.h" 
-#include "AliESDEvent.h" 
-#include "AliESDCaloCluster.h"
-#include "AliLog.h"
-#include "AliStack.h"
-#include "TParticle.h"
-
-//______________________________________________________________________________
-AliAnaCaloTriggerMC::AliAnaCaloTriggerMC() : 
-  fChain(0),
-  fESD(0), 
-  fOutputContainer(0),
-  fCalorimeter("PHOS"),
-  fNtTrigger22(0), 
-  fNtTriggerNN(0)
-
-{
-  // Default constructor.
-
-}
-//______________________________________________________________________________
-AliAnaCaloTriggerMC::AliAnaCaloTriggerMC(const char *name) : 
-  AliAnalysisTask(name, "AnaCaloTriggerMC"),
-  fChain(0),
-  fESD(0), 
-  fOutputContainer(0),
-  fCalorimeter("PHOS"),
-  fNtTrigger22(0), 
-  fNtTriggerNN(0)
-
-{
-  // Constructor.
-  // Input slot #0 works with an Ntuple
-  DefineInput(0, TChain::Class());
-  // Output slot #0 writes into a TH1 container
-  DefineOutput(0,  TObjArray::Class()) ; 
-}
-//____________________________________________________________________________
-AliAnaCaloTriggerMC::AliAnaCaloTriggerMC(const AliAnaCaloTriggerMC & ct) : 
-  AliAnalysisTask(ct),fChain(ct.fChain), fESD(ct.fESD),
-  fOutputContainer(ct.fOutputContainer), fCalorimeter(ct. fCalorimeter),
-  fNtTrigger22(ct.fNtTrigger22), fNtTriggerNN(ct.fNtTriggerNN)
-{
-
-  // cpy ctor
-  SetName (ct.GetName()) ; 
-  SetTitle(ct.GetTitle()) ;
- 
-}
-
-//_________________________________________________________________________
-AliAnaCaloTriggerMC & AliAnaCaloTriggerMC::operator = (const AliAnaCaloTriggerMC & source)
-{
-  // assignment operator
-  
-  if(&source == this) return *this;
-
-  fChain = source.fChain ; 
-  fESD = source.fESD ;
-  fOutputContainer = source.fOutputContainer ;
-  fCalorimeter = source. fCalorimeter ;
-  fNtTrigger22 = source.fNtTrigger22 ;
-  fNtTriggerNN = source.fNtTriggerNN ;
-
-  return *this;
-  
-}
-
-//______________________________________________________________________________
-AliAnaCaloTriggerMC::~AliAnaCaloTriggerMC()
-{
-  // dtor
-  //  fOutputContainer->Clear() ; 
-  //  delete fOutputContainer ;
-
-}
-
-
-//______________________________________________________________________________
-void AliAnaCaloTriggerMC::ConnectInputData(const Option_t*)
-{
-  // Initialisation of branch container and histograms 
-    
-  AliInfo(Form("*** Initialization of %s", GetName())) ; 
-  
-  // Get input data
-  fChain = dynamic_cast<TChain *>(GetInputData(0)) ;
-  if (!fChain) {
-    AliError(Form("Input 0 for %s not found\n", GetName()));
-    return ;
-  }
-  
-  fESD = new AliESDEvent();
-  fESD->ReadFromTree(fChain);
-
-}
-
-//________________________________________________________________________
-
-void AliAnaCaloTriggerMC::CreateOutputObjects()
-{ 
- 
-  // Create the output container
-  OpenFile(0);
- 
-  // create histograms 
-  fNtTrigger22 = new TNtuple(fCalorimeter+"trigger22", "Trigger data 2x2 patch", "a22:a220:enMax:phEnMax:eta22:phi22:etaMax:phiMax:phEtaMax:phPhiMax");
-  fNtTriggerNN = new TNtuple(fCalorimeter+"triggerNN", "Trigger data NxN patch", "aNN:aNN0:enMax:phEnMax:etaNN:phiNN:etaMax:phiMax:phEtaMax:phPhiMax");
-  
-  // create output container
-  
-  fOutputContainer = new TObjArray(2) ; 
-  fOutputContainer->SetName(GetName()) ; 
-
-  fOutputContainer->AddAt(fNtTrigger22,             0) ; 
-  fOutputContainer->AddAt(fNtTriggerNN,             1) ; 
-
-}
-
-//______________________________________________________________________________
-void AliAnaCaloTriggerMC::Exec(Option_t *) 
-{
-
-  // Processing of one event
-   
-  Long64_t entry = fChain->GetReadEntry() ;
- 
-  if (!fESD) {
-    AliError("fESD is not connected to the input!") ; 
-    return ; 
-  }
-
-  if ( !((entry-1)%100) ) 
-    AliInfo(Form("%s ----> Processing event # %lld",  (dynamic_cast<TChain *>(fChain))->GetFile()->GetName(), entry)) ; 
-
-  //Get MC data
-  AliStack* stack = 0x0; 
-  AliMCEventHandler*    mctruth = (AliMCEventHandler*) 
-    ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
-  
-  if(mctruth)
-    stack = mctruth->MCEvent()->Stack();
-  
-  if (!stack) {
-    AliError("Stack not found") ; 
-    return ; 
-  }
-  
-  // Get trigger information of fCalorimeter 
-  TArrayF * triggerAmplitudes = 0x0 ;
-  TArrayF * triggerPosition   = 0x0 ;
-  Int_t numberOfCaloClusters  = 0 ;
-  
-  if(fCalorimeter == "PHOS"){
-    triggerAmplitudes      = fESD->GetPHOSTriggerAmplitudes();
-    triggerPosition        = fESD->GetPHOSTriggerPosition();
-  }
-  else if(fCalorimeter == "EMCAL"){
-    triggerAmplitudes    = fESD->GetEMCALTriggerAmplitudes();
-    triggerPosition      = fESD->GetEMCALTriggerPosition();
-  }
-
-  if( triggerAmplitudes && triggerPosition ){
-    // trigger amplitudes
-    const Float_t ka22    = static_cast<Float_t>(triggerAmplitudes->At(0)) ; 
-    const Float_t ka22O   = static_cast<Float_t>(triggerAmplitudes->At(1)) ; 
-    const Float_t kaNN    = static_cast<Float_t>(triggerAmplitudes->At(2)) ; 
-    const Float_t kaNNO   = static_cast<Float_t>(triggerAmplitudes->At(3)) ; 
-    
-    // trigger position
-    const Float_t kx22  =  static_cast<Float_t>(triggerPosition->At(0)) ; 
-    const Float_t ky22  =  static_cast<Float_t>(triggerPosition->At(1)) ;
-    const Float_t kz22  =  static_cast<Float_t>(triggerPosition->At(2)) ;
-    const Float_t kxNN  =  static_cast<Float_t>(triggerPosition->At(3)) ; 
-    const Float_t kyNN  =  static_cast<Float_t>(triggerPosition->At(4)) ;
-    const Float_t kzNN  =  static_cast<Float_t>(triggerPosition->At(5)) ; 
-    
-    Float_t enMax       = 0. ;
-    Float_t phEnMax     = 0. ;
-    Float_t etaMax      = 0.5 ;
-    Float_t phiMax      = 0. ; 
-    Float_t phEtaMax    = 0.5 ;
-    Float_t phPhiMax    = 0. ; 
-    
-    TVector3 vpos22(kx22, ky22, kz22) ;
-    TVector3 vposNN(kxNN, kyNN, kzNN) ;
-    Float_t eta22 = vpos22.Eta() ; 
-    Float_t phi22 = vpos22.Phi() * TMath::RadToDeg() + 360. ; 
-    Float_t etaNN = vposNN.Eta() ; 
-    Float_t phiNN = vposNN.Phi() * TMath::RadToDeg() + 360. ; 
-    
-    Int_t      icaloCluster ; 
-    
-    // loop over the Calorimeters Clusters
-    Float_t cluEnergy = 0;
-    Int_t labelmax = -5;
-    for(icaloCluster = 0 ; icaloCluster < numberOfCaloClusters ; icaloCluster++) {
-
-      AliESDCaloCluster * cluster = fESD->GetCaloCluster(icaloCluster) ;
-
-      if (cluster && ( (fCalorimeter == "PHOS" && cluster->IsPHOS())  ||  
-                      (fCalorimeter == "EMCAL" && cluster->IsEMCAL()))) {
-
-       cluEnergy = cluster->E() ; 
-       Float_t pos[3] ;
-       TVector3 vpos ;
-       
-       cluster->GetPosition( pos ) ;
-       
-       if ( cluEnergy > enMax) { 
-         enMax = cluEnergy ; 
-         vpos.SetXYZ(pos[0], pos[1], pos[2]) ; 
-         etaMax = vpos.Eta() ; 
-         phiMax = vpos.Phi() ; 
-         labelmax = cluster->GetLabel();
-       }
-       
-       Double_t * pid = cluster->GetPid() ;
-       
-       if(pid[AliPID::kPhoton] > 0.9) {
-         if ( cluEnergy > phEnMax) { 
-           phEnMax = cluEnergy ; 
-           vpos.SetXYZ(pos[0], pos[1], pos[2]) ; 
-           phEtaMax = vpos.Eta() ; 
-           phPhiMax = vpos.Phi() ; 
-         }
-       }
-      }//if cluster
-    }//CaloCluster loop
-
-    if(labelmax < stack->GetNtrack() && labelmax >= 0 ){
-      TParticle * particle = stack->Particle(labelmax); 
-      Float_t ptgen = particle->Energy();
-      fNtTrigger22->Fill(ka22, ka22O, ptgen, enMax, phEnMax, eta22, phi22, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
-      fNtTriggerNN->Fill(kaNN, kaNNO, ptgen, enMax, phEnMax, etaNN, phiNN, etaMax, phiMax * TMath::RadToDeg() + 360., phEtaMax, phPhiMax * TMath::RadToDeg() + 360.);
-    }
-    else AliDebug(1, Form("Wrong label %d, ntrack %d, Emax %f ",labelmax, stack->GetNtrack(), phEnMax));
-  }//If trigger arrays filled
-    
-  PostData(0, fOutputContainer);
-  
-}
-
-
-//______________________________________________________________________________
-//void AliAnaCaloTriggerMC::Terminate(Option_t *) const
-//{
-//  // Processing when the event loop is ended
-//
-//}

diff --git a/PWG4/PartCorrDep/AliAnaCaloTriggerMC.h b/PWG4/PartCorrDep/AliAnaCaloTriggerMC.h
deleted file mode 100755 (executable)
index 4a8a254..0000000
--- a/PWG4/PartCorrDep/AliAnaCaloTriggerMC.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef ALIANACALOTRIGGERMC_H
-#define ALIANACALOTRIGGERMC_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice     */
-//______________________________________________________________________________
-// An analysis task to check the trigger data in ESD with MC data
-// Creates an ntuple for 2x2 and NxN triggers
-// Each ntuple connects the maximum trigger amplitudes 
-// and its positions with reconstructed clusters and MC
-//
-//*-- Yves Schutz (CERN) & Gustavo Conesa Balbastre (INFN-LNF)
-//////////////////////////////////////////////////////////////////////////////
-
-#include "AliAnalysisTask.h"  
-
-class TFile ;
-class TNtuple ;
-class TH1D ; 
-class TH1I ; 
-class TChain;
-
-class AliMCEvent ;
-class AliESDEvent ; 
-
-class AliAnaCaloTriggerMC : public AliAnalysisTask {
-
-public:
-  AliAnaCaloTriggerMC();
-  AliAnaCaloTriggerMC(const char *name) ;
-  AliAnaCaloTriggerMC(const AliAnaCaloTriggerMC & trig) ;
-  AliAnaCaloTriggerMC & operator=(const AliAnaCaloTriggerMC& source);
-  virtual ~AliAnaCaloTriggerMC() ;
-   
-  virtual void Exec(Option_t * opt = "") ;
-  virtual void ConnectInputData(Option_t *);
-  virtual void CreateOutputObjects();
-//  virtual void Terminate(Option_t * opt = "") const ;
-
-  TString GetCalorimeter()     const   {return fCalorimeter ; }
-  void    SetCalorimeter(TString calo) {fCalorimeter = calo ; }
-
-private:
-  TChain   * fChain ;            //!pointer to the analyzed TTree or TChain
-  AliESDEvent  * fESD ;              //! Declaration of leave types
-
-  TObjArray * fOutputContainer ; //! output data container
-
-  TString fCalorimeter ; // "PHOS" or "EMCAL"
-
-  // Histograms
-  TNtuple * fNtTrigger22 ; //Ntuple with 2x2 max dig amplitude and MC particle and cluster energy, and positions.
-  TNtuple * fNtTriggerNN ; //Ntuple with NxN max dig amplitude  and MC particle and cluster energy, and positions.
-
-  ClassDef(AliAnaCaloTriggerMC, 1); // a photon analysis task 
-};
-#endif // ALIANACALOTRIGGERMC_H

diff --git a/PWG4/libPWG4PartCorrDep.pkg b/PWG4/libPWG4PartCorrDep.pkg
index 1c34a0591eca025ab78d98d1d5d1ba438a13030c..455dff19664cc6dbafc2dda7d638636abd0ca7b6 100755 (executable)
--- a/PWG4/libPWG4PartCorrDep.pkg
+++ b/PWG4/libPWG4PartCorrDep.pkg
@@ -1,6 +1,6 @@
 #-*- Mode: Makefile -*-
 
-SRCS = PartCorrDep/AliAnaCaloTrigger.cxx PartCorrDep/AliAnaCaloTriggerMC.cxx \
+SRCS = PartCorrDep/AliAnaCaloTrigger.cxx \
        PartCorrDep/AliAnalysisTaskPHOSExample.cxx \
        PartCorrDep/AliAnaExample.cxx  PartCorrDep/AliAnaParticleIsolation.cxx \
        PartCorrDep/AliAnaParticlePartonCorrelation.cxx \