eliminating further private copy of AliMagF and cleaning the header file includes...
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 8 Nov 2009 09:22:18 +0000 (09:22 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 8 Nov 2009 09:22:18 +0000 (09:22 +0000)
HLT/TPCLib/AliHLTTPCTransform.cxx
HLT/TPCLib/AliHLTTPCdEdxComponent.cxx
HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx
HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx
HLT/TRD/AliHLTTRDTrackerV1Component.cxx

index 2788184..bdb9e33 100644 (file)
@@ -10,7 +10,6 @@
 
 #ifdef use_aliroot
 #include <AliRun.h>
-#include <AliMagF.h>
 #include <AliTPCParamSR.h>
 #include <AliTPCPRF2D.h>
 #include <AliTPCRF1D.h>
index b69765d..bb14871 100644 (file)
@@ -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();
index 175e417..0986598 100644 (file)
 #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"
index 97a83d3..9d2c221 100644 (file)
 #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"
index e065acf..a9b7437 100644 (file)
@@ -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"