From faf00b0d6b1e0a716b6ed35f0a4d5ee52b858547 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 23 Oct 2013 12:21:37 +0000 Subject: [PATCH] Changes for #102898 Fixes for newer ROOT HLT/TPCLib/comp/AliHLTTPCDataCompressionIDMap.h: ===================================== Make AliIDMapEntry public since newer ROOT does not allow dictionary generation for private sub-classes. #102897 Fixes for newer ROOT HLT/BASE/AliHLTComponentHandler.h: ===================================== Make AliHLTLibHandle public - newer ROOT cannot make dictionaries for private sub-classes. HLT/BASE/HLTbaseLinkDef.h: ===================================== Fix up schema evolution code for newer ROOT which does not give privileged access to data members in the streamers. #102893 Fixes for newer ROOT STEER/ESDLinkDef.h: ===================================== Fix up schema evolution code for newer ROOT which does not give privileged access to data members in the streamers. STEER/STEERBase/AliTRDPIDParams.h: ===================================== Preprocessor guard for ROOT Cling transition, which does not allow dictionary generation for private sub-classes. STEER/STEERBaseLinkDef.h: ===================================== Preprocessor guard for ROOT Cling transition, which does not allow dictionary generation for private sub-classes. EVGEN/AliGenParam.cxx: ===================================== Preprocessor switch for newer ROOT which does not define TF1::Integral(Double_t,Double_t,Double_t*,Double_t) but TF1::Integral(Double_t,Double_t,Double_t) #102883 A patch for HLT code HLT/BASE/AliHLTGlobalTriggerDecision.h: ===================================== Make MarkInputObjectAsOwned public for schema evolution HLT/BASE/AliHLTScalars.h: ===================================== Make GetScalars public for schema evolution HLT/trigger/AliHLTGlobalTriggerWrapper.cxx: ===================================== Add preprocessor switches for newer ROOT that uses Cling #102881 Patch for some code EVGEN/AliGenEMCocktail.cxx: ===================================== Add preprocessor switch in preparation for newer ROOT STEER/STEERBase/AliMCEventHandler.cxx: ===================================== In case a subsidary handler returns a null pointer for the MCEvent, do not try to add that event to the parent event --- EVGEN/AliGenEMCocktail.cxx | 36 +++++++++++++++---- EVGEN/AliGenParam.cxx | 13 +++++++ EVGEN/AliGenReaderTreeK.h | 2 +- HLT/BASE/AliHLTComponentHandler.h | 5 +-- HLT/BASE/AliHLTGlobalTriggerDecision.h | 11 +++--- HLT/BASE/AliHLTScalars.h | 3 ++ HLT/BASE/HLTbaseLinkDef.h | 2 +- HLT/MUON/OfflineInterface/AliHLTMUONAgent.cxx | 2 +- .../comp/AliHLTTPCDataCompressionIDMap.h | 4 +-- HLT/global/AliHLTGlobalVertexerComponent.h | 2 +- HLT/trigger/AliHLTGlobalTriggerWrapper.cxx | 19 ++++++---- STEER/ESDLinkDef.h | 2 +- STEER/STEER/AliTransportMonitor.h | 4 +-- STEER/STEERBase/AliDetectorTagCuts.h | 2 +- STEER/STEERBase/AliGenEventHeaderTunedPbPb.h | 2 +- STEER/STEERBase/AliMCEvent.h | 2 +- STEER/STEERBase/AliMCEventHandler.cxx | 1 + STEER/STEERBase/AliPIDCombined.h | 4 +-- STEER/STEERBase/AliTRDPIDParams.h | 11 +++++- STEER/STEERBaseLinkDef.h | 3 ++ 20 files changed, 96 insertions(+), 34 deletions(-) diff --git a/EVGEN/AliGenEMCocktail.cxx b/EVGEN/AliGenEMCocktail.cxx index 2c78959b808..011c0741d64 100644 --- a/EVGEN/AliGenEMCocktail.cxx +++ b/EVGEN/AliGenEMCocktail.cxx @@ -94,7 +94,11 @@ void AliGenEMCocktail::CreateCocktail() genpizero = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kPizero, "DUMMY"); AddSource2Generator(namePizero,genpizero); TF1 *fPtPizero = genpizero->GetPt(); - fYieldArray[kGenPizero] = fPtPizero->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) + fYieldArray[kGenPizero] = fPtPizero->Integral(fPtMin,fPtMax,1.e-6); +#else + fYieldArray[kGenPizero] = fPtPizero->Integral(fPtMin,fPtMax,(Double_t*)0,1.e-6); +#endif // eta AliGenParam * geneta=0; Char_t nameEta[10]; @@ -102,7 +106,11 @@ void AliGenEMCocktail::CreateCocktail() geneta = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kEta, "DUMMY"); AddSource2Generator(nameEta,geneta); TF1 *fPtEta = geneta->GetPt(); - fYieldArray[kGenEta] = fPtEta->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) + fYieldArray[kGenEta] = fPtEta->Integral(fPtMin,fPtMax,(Double_t*)0,1.e-6); +#else + fYieldArray[kGenEta] = fPtEta->Integral(fPtMin,fPtMax,1.e-6); +#endif // rho AliGenParam * genrho=0; Char_t nameRho[10]; @@ -110,7 +118,11 @@ void AliGenEMCocktail::CreateCocktail() genrho = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kRho, "DUMMY"); AddSource2Generator(nameRho,genrho); TF1 *fPtRho = genrho->GetPt(); - fYieldArray[kGenRho] = fPtRho->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) + fYieldArray[kGenRho] = fPtRho->Integral(fPtMin,fPtMax,1.e-6); +#else + fYieldArray[kGenRho] = fPtRho->Integral(fPtMin,fPtMax,(Double_t*)0,1.e-6); +#endif // omega AliGenParam * genomega=0; Char_t nameOmega[10]; @@ -118,7 +130,11 @@ void AliGenEMCocktail::CreateCocktail() genomega = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kOmega, "DUMMY"); AddSource2Generator(nameOmega,genomega); TF1 *fPtOmega = genomega->GetPt(); - fYieldArray[kGenOmega] = fPtOmega->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) + fYieldArray[kGenOmega] = fPtOmega->Integral(fPtMin,fPtMax,1.e-6); +#else + fYieldArray[kGenOmega] = fPtOmega->Integral(fPtMin,fPtMax,(double*)0,1.e-6); +#endif // etaprime AliGenParam * genetaprime=0; Char_t nameEtaprime[10]; @@ -126,7 +142,11 @@ void AliGenEMCocktail::CreateCocktail() genetaprime = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kEtaprime, "DUMMY"); AddSource2Generator(nameEtaprime,genetaprime); TF1 *fPtEtaprime = genetaprime->GetPt(); - fYieldArray[kGenEtaprime] = fPtEtaprime->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) + fYieldArray[kGenEtaprime] = fPtEtaprime->Integral(fPtMin,fPtMax,1.e-6); +#else + fYieldArray[kGenEtaprime] = fPtEtaprime->Integral(fPtMin,fPtMax,(Double_t*)0,1.e-6); +#endif // phi AliGenParam * genphi=0; Char_t namePhi[10]; @@ -134,7 +154,11 @@ void AliGenEMCocktail::CreateCocktail() genphi = new AliGenParam(fNPart, new AliGenEMlib(), AliGenEMlib::kPhi, "DUMMY"); AddSource2Generator(namePhi,genphi); TF1 *fPtPhi = genphi->GetPt(); - fYieldArray[kGenPhi] = fPtPhi->Integral(fPtMin,fPtMax,(Double_t *) 0x0,1.e-6); +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) + fYieldArray[kGenPhi] = fPtPhi->Integral(fPtMin,fPtMax,1.e-6); +#else + fYieldArray[kGenPhi] = fPtPhi->Integral(fPtMin,fPtMax,(Double_t*)0,1.e-6); +#endif } //------------------------------------------------------------------- diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index 717dae0f7d8..6589d1a5643 100644 --- a/EVGEN/AliGenParam.cxx +++ b/EVGEN/AliGenParam.cxx @@ -248,9 +248,15 @@ void AliGenParam::Init() fdNdy0=fYParaFunc(&y1,&y2); // // Integral over generation region +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) Float_t intYS = yPara.Integral(fYMin, fYMax,(Double_t*) 0x0,1.e-6); Float_t intPt0 = ptPara.Integral(0,15,(Double_t *) 0x0,1.e-6); Float_t intPtS = ptPara.Integral(fPtMin,fPtMax,(Double_t*) 0x0,1.e-6); +#else + Float_t intYS = yPara.Integral(fYMin, fYMax,1.e-6); + Float_t intPt0 = ptPara.Integral(0,15,1.e-6); + Float_t intPtS = ptPara.Integral(fPtMin,fPtMax,1.e-6); +#endif Float_t phiWgt=(fPhiMax-fPhiMin)/2./TMath::Pi(); //TR: should probably be done differently in case of anisotropic phi... if (fAnalog == kAnalog) { fYWgt = intYS/fdNdy0; @@ -566,10 +572,17 @@ Float_t AliGenParam::GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin, // // Normalisation for selected kinematic region // +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) Float_t ratio = fPtPara->Integral(ptMin,ptMax,(Double_t *)0,1.e-6) / fPtPara->Integral( fPtPara->GetXmin(), fPtPara->GetXmax(),(Double_t *)0,1.e-6) * fYPara->Integral(yMin,yMax,(Double_t *)0,1.e-6)/fYPara->Integral(fYPara->GetXmin(),fYPara->GetXmax(),(Double_t *)0,1.e-6) * (phiMax-phiMin)/360.; +#else + Float_t ratio = + fPtPara->Integral(ptMin,ptMax,1.e-6) / fPtPara->Integral( fPtPara->GetXmin(), fPtPara->GetXmax(),1.e-6) * + fYPara->Integral(yMin,yMax,1.e-6)/fYPara->Integral(fYPara->GetXmin(),fYPara->GetXmax(),1.e-6) * + (phiMax-phiMin)/360.; +#endif return TMath::Abs(ratio); } diff --git a/EVGEN/AliGenReaderTreeK.h b/EVGEN/AliGenReaderTreeK.h index e9307d52489..5404698789b 100644 --- a/EVGEN/AliGenReaderTreeK.h +++ b/EVGEN/AliGenReaderTreeK.h @@ -1,4 +1,4 @@ -#ifndef ALIGENREADERTreeK_H +#ifndef ALIGENREADERTREEK_H #define ALIGENREADERTREEK_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/HLT/BASE/AliHLTComponentHandler.h b/HLT/BASE/AliHLTComponentHandler.h index 96bebfbe7f9..9c84ff68e7c 100644 --- a/HLT/BASE/AliHLTComponentHandler.h +++ b/HLT/BASE/AliHLTComponentHandler.h @@ -300,8 +300,9 @@ class AliHLTComponentHandler : public AliHLTLogging { */ int ActivateAgents(const char* library=NULL, const char* blackList=NULL); +public: /** - * Compound descriptor for component libraries + * Compound descriptor for component libraries - must be public */ struct AliHLTLibHandle { AliHLTLibHandle() : fHandle(NULL), fName(NULL), fMode(kDynamic) {} @@ -312,7 +313,7 @@ class AliHLTComponentHandler : public AliHLTLogging { /** library mode: kStatic means never unloaded */ TLibraryMode fMode; //! transient }; - +private: /** * Find a specific library among the loaded libraries. * @param library library name/path diff --git a/HLT/BASE/AliHLTGlobalTriggerDecision.h b/HLT/BASE/AliHLTGlobalTriggerDecision.h index 97533f5ddc1..96a89cd08c8 100644 --- a/HLT/BASE/AliHLTGlobalTriggerDecision.h +++ b/HLT/BASE/AliHLTGlobalTriggerDecision.h @@ -240,6 +240,12 @@ class AliHLTGlobalTriggerDecision : public AliHLTTriggerDecision */ virtual /*const*/ TObject* FindObject(const TObject* obj) const; + /** + * This method is called in the streamer to mark the entries in + * fInputObjects as owned and deletable. MUST be public for + * streamer evolution to work. + */ + void MarkInputObjectsAsOwned(); private: /** @@ -248,11 +254,6 @@ class AliHLTGlobalTriggerDecision : public AliHLTTriggerDecision */ void DeleteInputObjects(); - /** - * This method is called in the streamer to mark the entries in fInputObjects as - * owned and deletable. - */ - void MarkInputObjectsAsOwned(); TClonesArray fContributingTriggers; /// The list of contributing trigger decisions from all AliHLTTrigger components that were considered. TObjArray fInputObjects; /// The list of other input objects. diff --git a/HLT/BASE/AliHLTScalars.h b/HLT/BASE/AliHLTScalars.h index f7447359632..73cb9d0df50 100644 --- a/HLT/BASE/AliHLTScalars.h +++ b/HLT/BASE/AliHLTScalars.h @@ -118,6 +118,9 @@ public: /// Default destructor. virtual ~AliHLTScalars(); + /// Needed by schema evolution + const TClonesArray* GetScalars() const { return &fScalars; } + /** * Adds a new scalar to the end of the scalars list. * If the scalar already exists then its values are updated instead. diff --git a/HLT/BASE/HLTbaseLinkDef.h b/HLT/BASE/HLTbaseLinkDef.h index ef917569aef..59a8f9f7426 100644 --- a/HLT/BASE/HLTbaseLinkDef.h +++ b/HLT/BASE/HLTbaseLinkDef.h @@ -124,7 +124,7 @@ // Need to initialise the hash table which is transient after reading the class. #pragma read sourceClass="AliHLTScalars" version="[1-]" targetClass="AliHLTScalars"\ - source="" target="fMap" code="{fMap.AddAll(&newObj->fScalars);}" + source="" target="fMap" code="{fMap.AddAll(newObj->GetScalars());}" #pragma link C++ struct AliHLTComponentEventData+; #pragma link C++ struct AliHLTComponentBlockData+; diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONAgent.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONAgent.cxx index b3fb83b60ed..e4ecbf1c6f8 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONAgent.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONAgent.cxx @@ -168,7 +168,7 @@ const char* AliHLTMUONAgent::GetRequiredComponentLibraries() const static const char* libs[] = { "libCore.so", - "libCint.so", + // "libCint.so", "libGraf.so", "libRIO.so", "libNet.so", diff --git a/HLT/TPCLib/comp/AliHLTTPCDataCompressionIDMap.h b/HLT/TPCLib/comp/AliHLTTPCDataCompressionIDMap.h index 19b51110e92..ffcb6e9c069 100644 --- a/HLT/TPCLib/comp/AliHLTTPCDataCompressionIDMap.h +++ b/HLT/TPCLib/comp/AliHLTTPCDataCompressionIDMap.h @@ -35,12 +35,12 @@ class AliHLTTPCDataCompressionIDMap: public AliHLTLogging{ void SetIDMap( const AliHLTUInt8_t *data, AliHLTUInt32_t sizeBytes ); int WriteIDMap( AliHLTUInt8_t* output, AliHLTUInt32_t& sizeBytes ); - private: - + // Must be public for dictionary struct AliIDMapEntry{ AliHLTUInt32_t fHltID; // HLT ID of a cluster AliHLTUInt32_t fOfflineID; // offline ID of a cluster }; + private: static Bool_t CompareIDs( const AliIDMapEntry &a, const AliIDMapEntry &b ){ return a.fHltID < b.fHltID; } diff --git a/HLT/global/AliHLTGlobalVertexerComponent.h b/HLT/global/AliHLTGlobalVertexerComponent.h index ed5fea78ff1..30288a86b75 100644 --- a/HLT/global/AliHLTGlobalVertexerComponent.h +++ b/HLT/global/AliHLTGlobalVertexerComponent.h @@ -1,5 +1,5 @@ #ifndef ALIHLTGLOBALVERTEXERCOMPONENT_H -#define ALIHLTGLOBALVERTEXEROMPONENT_H +#define ALIHLTGLOBALVERTEXERCOMPONENT_H //* This file is property of and copyright by the ALICE HLT Project * //* ALICE Experiment at CERN, All rights reserved. * //* See cxx source for full Copyright notice * diff --git a/HLT/trigger/AliHLTGlobalTriggerWrapper.cxx b/HLT/trigger/AliHLTGlobalTriggerWrapper.cxx index 6a2b1b2e602..aa0e012a75f 100644 --- a/HLT/trigger/AliHLTGlobalTriggerWrapper.cxx +++ b/HLT/trigger/AliHLTGlobalTriggerWrapper.cxx @@ -29,7 +29,12 @@ #include "TArrayL64.h" #include "TClass.h" #include "TInterpreter.h" +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) #include "TCint.h" +# define LAST_ERR_LINENO G__lasterror_linenum() +#else +# define LAST_ERR_LINENO 0 +#endif ClassImp(AliHLTGlobalTriggerWrapper) @@ -144,7 +149,9 @@ AliHLTGlobalTriggerWrapper::~AliHLTGlobalTriggerWrapper() // Default destructor. fClass->Destructor(fObject); +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) G__set_errmsgcallback(NULL); +#endif } @@ -165,7 +172,7 @@ void AliHLTGlobalTriggerWrapper::FillFromMenu(const AliHLTTriggerMenu& menu) { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); } } @@ -181,7 +188,7 @@ void AliHLTGlobalTriggerWrapper::NewEvent() { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); } } @@ -210,7 +217,7 @@ void AliHLTGlobalTriggerWrapper::Add( { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); } } @@ -237,7 +244,7 @@ bool AliHLTGlobalTriggerWrapper::CalculateTriggerDecision(bool& triggerResult, A { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); return false; } return bool(retval); @@ -255,7 +262,7 @@ const TArrayL64& AliHLTGlobalTriggerWrapper::GetCounters() const { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); } static const TArrayL64 emptyArray; const TArrayL64* ptr = &emptyArray; // Make sure we do not return a NULL pointer. @@ -281,7 +288,7 @@ void AliHLTGlobalTriggerWrapper::SetCounters(const TArrayL64& counters) { fCallFailed = true; HLTError(gCINTErrorMessage.Data()); - HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), G__lasterror_linenum()); + HLTFatal("Error interpreting the code for class '%s' at line %d.", fClass->GetName(), LAST_ERR_LINENO); } } diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h index 878ade582ef..0808b4a6e0c 100644 --- a/STEER/ESDLinkDef.h +++ b/STEER/ESDLinkDef.h @@ -25,7 +25,7 @@ target="fNEntries, fColumn, fRow, fTriggerBits" targetType="Int, Int_t*, Int_t*, Int_t*" code="{fTriggerBits = new Int_t[fNEntries]; for (Int_t i=0; i #include -#include +#include "AliDAQ.h" class AliDetectorTag; diff --git a/STEER/STEERBase/AliGenEventHeaderTunedPbPb.h b/STEER/STEERBase/AliGenEventHeaderTunedPbPb.h index 813e7465d22..2f3c7f67c83 100644 --- a/STEER/STEERBase/AliGenEventHeaderTunedPbPb.h +++ b/STEER/STEERBase/AliGenEventHeaderTunedPbPb.h @@ -12,7 +12,7 @@ // Author: andreas.morsch@cern.ch //--------------------------------------------------------------------- -#include +#include "AliGenEventHeader.h" class AliGenEventHeaderTunedPbPb : public AliGenEventHeader { diff --git a/STEER/STEERBase/AliMCEvent.h b/STEER/STEERBase/AliMCEvent.h index 1f28a5e6741..d1accb7cf9c 100644 --- a/STEER/STEERBase/AliMCEvent.h +++ b/STEER/STEERBase/AliMCEvent.h @@ -18,7 +18,7 @@ #include #include -#include +#include "AliVEvent.h" #include "AliVHeader.h" #include "AliVParticle.h" #include "AliVVertex.h" diff --git a/STEER/STEERBase/AliMCEventHandler.cxx b/STEER/STEERBase/AliMCEventHandler.cxx index b2bf59a2b05..dddd823f9c7 100644 --- a/STEER/STEERBase/AliMCEventHandler.cxx +++ b/STEER/STEERBase/AliMCEventHandler.cxx @@ -338,6 +338,7 @@ Bool_t AliMCEventHandler::BeginEvent(Long64_t entry) } next.Reset(); while((handler = (AliMCEventHandler*)next())) { + if (!handler->MCEvent()) continue; fMCEvent->AddSubsidiaryEvent(handler->MCEvent()); } fMCEvent->InitEvent(); diff --git a/STEER/STEERBase/AliPIDCombined.h b/STEER/STEERBase/AliPIDCombined.h index 5efe22a8f89..6fb62ec166e 100644 --- a/STEER/STEERBase/AliPIDCombined.h +++ b/STEER/STEERBase/AliPIDCombined.h @@ -15,8 +15,8 @@ #include -#include -#include +#include "AliPID.h" +#include "AliPIDResponse.h" #include #include diff --git a/STEER/STEERBase/AliTRDPIDParams.h b/STEER/STEERBase/AliTRDPIDParams.h index c8c4e7349c7..7191aa56797 100644 --- a/STEER/STEERBase/AliTRDPIDParams.h +++ b/STEER/STEERBase/AliTRDPIDParams.h @@ -37,7 +37,7 @@ class AliTRDPIDParams : public TNamed{ Bool_t GetThresholdParameters(Int_t ntracklets, Double_t efficiency, Double_t *params, Double_t centrality = -1) const; void SetThresholdParameters(Int_t ntracklets, Double_t effMin, Double_t effMax, Double_t *params, Double_t centrality = -1); - private: + /* private: */ class AliTRDPIDThresholds : public TObject{ public: AliTRDPIDThresholds(); @@ -60,7 +60,10 @@ class AliTRDPIDParams : public TNamed{ Double_t fEfficiency[2]; // Double_t fParams[4]; // + // #if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) + // Private - cannot be streamed ClassDef(AliTRDPIDThresholds, 1); + // #endif }; class AliTRDPIDCentrality : public TObject{ @@ -81,14 +84,20 @@ class AliTRDPIDParams : public TNamed{ TSortedList *fEntries; // Double_t fMinCentrality; // Double_t fMaxCentrality; // + + // #if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) + // Private - cannot be streamed ClassDef(AliTRDPIDCentrality, 1); + // #endif }; + private: AliTRDPIDCentrality *FindCentrality(Double_t centrality) const; AliTRDPIDParams &operator=(const AliTRDPIDParams &); static const Double_t kVerySmall; TList *fEntries; // + ClassDef(AliTRDPIDParams, 2); }; #endif diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h index 78e115fdb08..3ede77bdacd 100644 --- a/STEER/STEERBaseLinkDef.h +++ b/STEER/STEERBaseLinkDef.h @@ -86,8 +86,11 @@ #pragma link C++ class AliTRDPIDReference+; #pragma link C++ class AliTRDPIDParams+; +/* #if ROOT_VERSION_CODE < 0x56300 // ROOT_VERSION(5,99,0) */ +// AliTRDPIDThresholds and Centrality are private #pragma link C++ class AliTRDPIDParams::AliTRDPIDThresholds+; #pragma link C++ class AliTRDPIDParams::AliTRDPIDCentrality+; +/* #endif */ #pragma link C++ class AliTRDPIDResponseObject+; #pragma link C++ class AliTRDTKDInterpolator+; #pragma link C++ class AliTRDTKDInterpolator::AliTRDTKDNodeInfo+; -- 2.43.0