From 07e318cb443586acb1466c18a90da66c5a099abc Mon Sep 17 00:00:00 2001 From: richterm Date: Mon, 22 Mar 2010 17:35:28 +0000 Subject: [PATCH] adding compatibility code for AliTRDrawStream r39608 and removing old compatibility code for AliTRDrecoParam r34995 (Theo) --- HLT/TRD/AliHLTTRDClusterizerComponent.cxx | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx index 271788b12bc..bdf113d15f6 100644 --- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx +++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx @@ -590,24 +590,13 @@ int AliHLTTRDClusterizerComponent::SetParams() return -EINVAL; } - // backward compatibility to AliTRDrecoParam < r34995 -# ifndef HAVE_NOT_ALITRDRECOPARAM_r34995 -# define AliTRDRecoParamSetTailCancelation(b) fRecoParam->SetTailCancelation(b) -# define AliTRDRecoParamSetGAUS(b) fRecoParam->SetGAUS(b) -# define AliTRDRecoParamSetLUT(b) fRecoParam->SetLUT(b) -# else -# define AliTRDRecoParamSetTailCancelation(b) fRecoParam->SetTailCancelation() -# define AliTRDRecoParamSetGAUS(b) fRecoParam->SetGAUS() -# define AliTRDRecoParamSetLUT(b) fRecoParam->SetLUT() -# endif - if(fTC){fRecoParam->SetTailCancelation(kTRUE); HLTDebug("Enableing Tail Cancelation"); } else{fRecoParam->SetTailCancelation(kFALSE); HLTDebug("Disableing Tail Cancelation"); } switch(fyPosMethod){ - case 0: AliTRDRecoParamSetGAUS(kFALSE); AliTRDRecoParamSetLUT(kFALSE); break; - case 1: AliTRDRecoParamSetGAUS(kFALSE); AliTRDRecoParamSetLUT(kTRUE); break; - case 2: AliTRDRecoParamSetGAUS(kTRUE); AliTRDRecoParamSetLUT(kFALSE); break; + case 0: fRecoParam->SetGAUS(kFALSE); fRecoParam->SetLUT(kFALSE); break; + case 1: fRecoParam->SetGAUS(kFALSE); fRecoParam->SetLUT(kTRUE); break; + case 2: fRecoParam->SetGAUS(kTRUE); fRecoParam->SetLUT(kFALSE); break; } fRecoParam->SetStreamLevel(AliTRDrecoParam::kClusterizer, 0); @@ -640,11 +629,20 @@ int AliHLTTRDClusterizerComponent::SetParams() HLTDebug("Data type expected is EXPERIMENT!"); } - if (fHLTstreamer) - { +#ifndef HAVE_NOT_ALITRD_RAWSTREAM_r39608 + if(fHLTstreamer){ + AliTRDrawStreamBase::SetRawStreamVersion("default"); + HLTDebug("fast rawstreamer used"); + }else{ + AliTRDrawStreamBase::SetRawStreamVersion("FAST"); + HLTDebug("old rawstreamer used"); + } +#else + if(fHLTstreamer){ AliTRDrawStreamBase::SetRawStreamVersion("FAST"); HLTDebug("fast rawstreamer used"); } +#endif if(!fClusterizer){ fClusterizer = new AliHLTTRDClusterizer("TRDCclusterizer", "TRDCclusterizer"); -- 2.43.0