- update track cuts

[u/mrichter/AliRoot.git] / MUON / AliMUONChamberCalibrationTask.cxx

diff --git a/MUON/AliMUONChamberCalibrationTask.cxx b/MUON/AliMUONChamberCalibrationTask.cxx
index 89e45e54667f5e88cc3a6eaeef0f1ee58ec052fa..db4ca9f28b14744bdf15485e34a9529e9d864b84 100644 (file)
--- a/MUON/AliMUONChamberCalibrationTask.cxx
+++ b/MUON/AliMUONChamberCalibrationTask.cxx
@@ -25,7 +25,7 @@
 
 #include <TBranch.h>
 #include <TChain.h>
-#include <TClonesArray.h>
+#include <TObjArray.h>
 #include <TFile.h>
 #include <TMath.h>
 #include <TRandom.h>
@@ -37,12 +37,12 @@
 
 // STEER includes
 #include "AliCDBManager.h"
+#include "AliGRPManager.h"
 #include "AliESDEvent.h"
 #include "AliESDInputHandler.h"
 #include "AliESDtrack.h"
 #include "AliESDMuonTrack.h"
 #include "AliLog.h"
-#include "AliMagF.h"
 #include "AliRecoParam.h"
 #include "AliTracker.h"
 
@@ -77,7 +77,7 @@ ClassImp( AliMUONChamberCalibrationTask )
 AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask():
   AliAnalysisTaskSE( "AliMUONChamberCalibrationTask" ),
   fOCDBPath( "local://$ALICE_ROOT/OCDB" ),
-  fCalibChoice(NOGAIN),
+  fCalibChoice(kNOGAIN),
   fClusterInfoTree(0x0),
   fMuonRecoParam(0x0),
   fClusterInfo(0x0),
@@ -99,7 +99,7 @@ AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask( const char* name,
                                                              const Int_t my_calib_option ):
   AliAnalysisTaskSE( name ),
   fOCDBPath( "local://$ALICE_ROOT/OCDB" ),
-  fCalibChoice(NOGAIN),
+  fCalibChoice(kNOGAIN),
   fClusterInfoTree(0x0),
   fMuonRecoParam(0x0),
   fClusterInfo(0x0),
@@ -114,12 +114,12 @@ AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask( const char* name,
   //
 
   fOCDBPath = ocdbpath;
-  if ( (my_calib_option >= ((Int_t)NOGAIN)) && (my_calib_option <= ((Int_t)INJECTIONGAIN)) ) 
+  if ( (my_calib_option >= ((Int_t)kNOGAIN)) && (my_calib_option <= ((Int_t)kINJECTIONGAIN)) ) 
     fCalibChoice = (Calibration_t)my_calib_option;
   else {
     AliWarning( Form("Wrong value of the calibration option %d not within [%d, %d] !!! Will use NOGAIN", 
-                    my_calib_option, (Int_t)NOGAIN, (Int_t)INJECTIONGAIN ) );
-    fCalibChoice = NOGAIN;
+                    my_calib_option, (Int_t)kNOGAIN, (Int_t)kINJECTIONGAIN ) );
+    fCalibChoice = kNOGAIN;
   }
 }
 
@@ -174,9 +174,10 @@ void AliMUONChamberCalibrationTask::LocalInit()
 
   if ( !TGeoGlobalMagField::Instance()->GetField() ) {
     AliInfo( "Loading field map..." );
-    AliMagF* field = new AliMagF( "Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG );
-    TGeoGlobalMagField::Instance()->SetField( field );
-    TGeoGlobalMagField::Instance()->Lock();
+    AliGRPManager *grpMan = new AliGRPManager();
+    grpMan->ReadGRPEntry();
+    grpMan->SetMagField();
+    delete grpMan;
   }
   
   // Load mapping
@@ -203,9 +204,9 @@ void AliMUONChamberCalibrationTask::LocalInit()
   TString caliboption4 = "INJECTIONGAIN";
 
   TString caliboption = caliboption1;
-  if ( fCalibChoice == GAINCONSTANTCAPA ) caliboption = caliboption2;
-  if ( fCalibChoice == GAIN ) caliboption = caliboption3;  
-  if ( fCalibChoice == INJECTIONGAIN ) caliboption = caliboption4;
+  if ( fCalibChoice == kGAINCONSTANTCAPA ) caliboption = caliboption2;
+  if ( fCalibChoice == kGAIN ) caliboption = caliboption3;  
+  if ( fCalibChoice == kINJECTIONGAIN ) caliboption = caliboption4;
   fMuonRecoParam->SetCalibrationMode(caliboption.Data());
 
   for (Int_t iCh=0; iCh<10; iCh++) {