Transition to NewIO

[u/mrichter/AliRoot.git] / STEER / AliMagFMaps.h

diff --git a/STEER/AliMagFMaps.h b/STEER/AliMagFMaps.h
index c13fe45f1566fbea8dbcd088fff3b9c955e57b30..eafcd1e9277c88b61f4f128a1dacb0d58e40f3a1 100644 (file)
--- a/STEER/AliMagFMaps.h
+++ b/STEER/AliMagFMaps.h
@@ -18,7 +18,7 @@ class AliMagFMaps : public AliMagF
 
 public:
     enum constants {k2kG, k4kG, k5kG};
-    AliMagFMaps(){fFieldMap[0] = fFieldMap[1] = fFieldMap[2] = 0; fFieldRead = 0;}
+    AliMagFMaps();
     AliMagFMaps(const char *name, const char *title, const Int_t integ,
                const Float_t factor, const Float_t fmax, const Int_t map = k2kG,
                const Int_t l3 = 1);
@@ -29,22 +29,21 @@ public:
     virtual void ReadField();
     virtual Float_t SolenoidField() const;
     virtual void    SetL3ConstField(Int_t flag = 0) {fL3Option = flag;}
+    virtual void    SetL3ConstField(Float_t bsol, Int_t flag = 0)
+       {fL3Option = flag; fSolenoidUser = bsol;}
     
-    void Copy(AliMagFMaps &magf) const;
-    virtual AliMagFMaps & operator=(const AliMagFMaps &magf);
+    virtual AliMagFMaps & operator=(const AliMagFMaps &magf)
+      {magf.Copy(*this); return *this;}
+
 protected:
+    void Copy(AliMagFMaps &magf) const;
+
     AliFieldMap* fFieldMap[3];     // Field maps
     Float_t      fSolenoid;        // Solenoid field setting
+    Float_t      fSolenoidUser;    // User set solenoid field setting  
     Int_t        fL3Option;        // Option for field inside L3
     Int_t        fFieldRead;       // Field has been read in
-    ClassDef(AliMagFMaps,2)        // Class for all Alice MagField using three Maps with Constant Mesh
+    ClassDef(AliMagFMaps,3)        // Class for all Alice MagField using three Maps with Constant Mesh
 };
 
 #endif
-
-
-
-
-
-
-