eliminating further private copy of AliMagF and cleaning the header file includes...

diff --git a/HLT/TPCLib/AliHLTTPCTransform.cxx b/HLT/TPCLib/AliHLTTPCTransform.cxx
index 2788184d12aea334b59edfe9582b127794d35251..bdb9e33ebf591e97f5c5dd23b9ed3912d3fd186f 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCTransform.cxx
+++ b/HLT/TPCLib/AliHLTTPCTransform.cxx
@@ -10,7 +10,6 @@
 
 #ifdef use_aliroot
 #include <AliRun.h>
-#include <AliMagF.h>
 #include <AliTPCParamSR.h>
 #include <AliTPCPRF2D.h>
 #include <AliTPCRF1D.h>

diff --git a/HLT/TPCLib/AliHLTTPCdEdxComponent.cxx b/HLT/TPCLib/AliHLTTPCdEdxComponent.cxx
index b69765d0fdee7a6f46e316bf250ea490353ecd93..bb14871e176161de5ec405c49968ebf938899a0c 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCdEdxComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCdEdxComponent.cxx
@@ -45,7 +45,6 @@
 #include "AliTPCseed.h"
 #include "AliTPCclusterMI.h"
 #include "TGeoGlobalMagField.h"
-#include "AliMagF.h"
 
 
 /** ROOT macro for the implementation of ROOT specific class methods */
@@ -269,13 +268,10 @@ int AliHLTTPCdEdxComponent::DoInit( int argc, const char** argv )
 
   int ret = Configure( NULL, NULL, arguments.Data() );
 
-  // set field
-  if (!TGeoGlobalMagField::Instance()->IsLocked()) {
-    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
-    field->SetFactorSol(1);
-    Double_t initialFieldStrengh=field->SolenoidField();
-    field->SetFactorSol(fSolenoidBz/initialFieldStrengh); 
-    TGeoGlobalMagField::Instance()->SetField(field);  
+  // Check field
+  if (!TGeoGlobalMagField::Instance()) {
+    HLTError("magnetic field not initialized, please set up TGeoGlobalMagField and AliMagF");
+    return -ENODEV;
   }
   
   //AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform();

diff --git a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx
index 175e417b1302b92327fd537465b7f0c950097bb6..098659807e3a3d05ee3a4119b42f5d913ac1c784 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx
+++ b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx
@@ -30,11 +30,6 @@
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
 #include "AliGeomManager.h"
-#ifndef HAVE_NOT_ALIMAGF30848
-#include "AliMagF.h"
-#else // keeping the <30489 code for backward compatibility, to be merged at some point
-#include "AliMagFMaps.h"
-#endif
 #include "AliTPCReconstructor.h"
 #include "AliTPCParam.h"
 #include "AliTPCRecoParam.h"

diff --git a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx
index 97a83d30ef7af2f01a002c24c2e6a49605d25a75..9d2c2216e1e5f347ced6d965f23460d52c3f5684 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx
+++ b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx
@@ -30,11 +30,6 @@
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
 #include "AliGeomManager.h"
-#ifndef HAVE_NOT_ALIMAGF30848
-#include "AliMagF.h"
-#else // keeping the <30489 code for backward compatibility, to be merged at some point
-#include "AliMagFMaps.h"
-#endif
 #include "AliTPCReconstructor.h"
 #include "AliTPCParam.h"
 #include "AliTPCRecoParam.h"

diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
index e065acf5ee7d6b0a7e8f1cb38770df3d1cc90519..a9b74374d128444ceb4d99bd456d519ba7057041 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
@@ -40,7 +40,6 @@ using namespace std;
 #include "AliCDBStorage.h"
 #include "AliCDBEntry.h"
 #include "AliESDEvent.h"
-#include "AliMagF.h"
 #include "AliESDfriend.h"
 
 #include "AliTRDcalibDB.h"