Changes to work with 4 Release.

diff --git a/JETAN/AliJetParticlesReaderKine.cxx b/JETAN/AliJetParticlesReaderKine.cxx
index 218336edab2b02d8aadedc2364178e6daf107f83..6c4c7b1a361fa73a53a217df3a3b34ddc44d3bc3 100644 (file)
--- a/JETAN/AliJetParticlesReaderKine.cxx
+++ b/JETAN/AliJetParticlesReaderKine.cxx
@@ -126,7 +126,9 @@ Int_t AliJetParticlesReaderKine::ReadNext()
        if(!pheader) {
          Warning("ReadNext","Pythia-Header not found in event %d",fCurrentEvent);
        } else {
-         Int_t ntruq=pheader->NUQTriggerJets();
+         Int_t ntruq=0;
+#ifndef NOUQHEADERINFO
+         ntruq=pheader->NUQTriggerJets();
          if(ntruq){
            Double_t x0=pheader->GetXJet();
            Double_t y0=pheader->GetYJet();
@@ -140,6 +142,7 @@ Int_t AliJetParticlesReaderKine::ReadNext()
              fEventParticles->AddUQJet(pjet);
            }
          }
+#endif
          //Int_t ptyp=pheader->ProcessType();
          Int_t ntrials=pheader->Trials();
          headdesc+=": Tr ";

diff --git a/JETAN/Makefile b/JETAN/Makefile
index 670e93e16996b31ff45b8c6155bbcc9b0f3d93c4..9e8507514053c26c959a445492e392fa7d928cd9 100644 (file)
--- a/JETAN/Makefile
+++ b/JETAN/Makefile
@@ -161,9 +161,9 @@ JETANEXPORTDEST:=$(patsubst %,$(EXPORTDIR)/%,$(EXPORT))
 
 #Extra include,libs, defines etc.
 
-JETANDEFINE:=$(EDEFINE)
+JETANDEFINE:=$(EDEFINE) -DNOUQHEADERINFO
 
-JETANINC:=$(patsubst %,-I%,$(EINCLUDE)) -I.
+JETANINC:=$(patsubst %,-I$(ALICE_ROOT)/%,$(EINCLUDE)) -I.
 
 JETANELIBS:=$(patsubst %,-l%,$(ELIBS))
 JETANELIBSDEP:=$(patsubst %,lib/tgt_$(ALICE_TARGET)/lib%.$(SOEXT),$(ELIBS))