// Author: Andreas Morsch <andreas.morsch@cern.ch>
//------------------------------------------------------------------------
+#include <TClass.h>
#include <TFile.h>
+#include <TMath.h>
#include <TSystem.h>
-#include <TVector.h>
+#include "AliLog.h"
#include "AliFieldMap.h"
#include "AliMagFMaps.h"
ClassImp(AliMagFMaps)
+
//_______________________________________________________________________
AliMagFMaps::AliMagFMaps():
fSolenoid(0),
fSolenoidUser(0.),
- fL3Option(0),
- fFieldRead(0)
+ fL3Option(0)
{
//
// Default constructor
//
+ //
+ // Don't replicate field information in gAlice
fFieldMap[0] = fFieldMap[1] = fFieldMap[2] = 0;
}
AliMagFC(name,title,integ,factor,fmax),
fSolenoid(0),
fSolenoidUser(0),
- fL3Option(l3),
- fFieldRead(0)
+ fL3Option(l3)
{
//
// Standard constructor
fMap = map;
fL3Option = l3;
ReadField();
- fFieldRead = 1;
//
// Don't replicate field information in gAlice
for (Int_t i = 0; i < 3; i++) fFieldMap[i]->SetWriteEnable(0);
AliMagFMaps::AliMagFMaps(const AliMagFMaps &magf):
AliMagFC(magf),
fSolenoid(0),
- fL3Option(0),
- fFieldRead(0)
+ fSolenoidUser(0),
+ fL3Option(0)
{
//
// Copy constructor
delete fFieldMap[0];
delete fFieldMap[1];
delete fFieldMap[2];
+ fgReadField = kTRUE;
}
//_______________________________________________________________________
//
// don't read twice
//
- if (fFieldRead) return;
- fFieldRead = 1;
+ if (!fgReadField) return;
+ fgReadField = 0;
//
char* fname;
TFile* file = 0;
// Returns max. L3 (solenoid) field strength
// according to field map setting
//
- return fSolenoid;
+ return -Factor()*fSolenoid;
}
//_______________________________________________________________________
-void AliMagFMaps::Field(Float_t *x, Float_t *b)
+void AliMagFMaps::Field(Float_t *x, Float_t *b) const
{
//
// Method to calculate the magnetic field
- if (!fFieldRead) ReadField();
+ // if (!fFieldRead) ReadField();
//
// Field Maps have been calculated for the coordinate system in which
AliFieldMap* map = 0;
if (fFieldMap[0]->Inside(xm[0], xm[1], xm[2])) {
map = fFieldMap[0];
- if (!fL3Option && TMath::Abs(xm[2]) < 370.) {
+ Float_t r = TMath::Sqrt(xm[0] * xm[0] + xm[1] * xm[1]);
+
+ if (!fL3Option && TMath::Abs(xm[2]) < 370. && r < 550.) {
//
// Constant L3 field , if this option was selected
//
- b[2] = - fSolenoid;
+ b[2] = (- fSolenoid)*fFactor;
return;
}
} else if (fFieldMap[1]->Inside(xm[0], xm[1], xm[2])) {
//
// Copy *this onto magf -- Not implemented
//
- Fatal("Copy","Not implemented!\n");
+ AliFatal("Not implemented!");
}
//_______________________________________________________________________
// Stream an object of class AliMagFMaps.
if (R__b.IsReading()) {
AliMagFMaps::Class()->ReadBuffer(R__b, this);
- fFieldRead = 0;
+ ReadField();
} else {
AliMagFMaps::Class()->WriteBuffer(R__b, this);
}