added methods to reset L3 and Dip params

diff --git a/STEER/STEERBase/AliMagWrapCheb.cxx b/STEER/STEERBase/AliMagWrapCheb.cxx
index 4fa8589ec8a637488f6d692134a3bee249a161f9..21e48ced08ffa8697ae13b1d9f60e1ec9a218588 100644 (file)
--- a/STEER/STEERBase/AliMagWrapCheb.cxx
+++ b/STEER/STEERBase/AliMagWrapCheb.cxx
@@ -18,7 +18,6 @@
 #include <TSystem.h>
 #include <TArrayF.h>
 #include <TArrayI.h>
-#include <AliCheb3D.h>
 
 ClassImp(AliMagWrapCheb)
 
@@ -692,13 +691,13 @@ void AliMagWrapCheb::LoadData(const char* inpfile)
   //
   AliCheb3DCalc::ReadLine(buffs,stream);
   if (!buffs.BeginsWith("END DIPOLE")) {
-    Error("LoadData","Expected \"END DIPOLE\", found \"%s\"\nStop\n",GetName(),buffs.Data());
+    Error("LoadData","Expected \"END DIPOLE\", found \"%s\"\nStop\n",buffs.Data());
     exit(1);
   }
   //
   AliCheb3DCalc::ReadLine(buffs,stream);
-  if (!buffs.BeginsWith("END") || !buffs.Contains(GetName())) {
-    Error("LoadData","Expected: \"END %s\", found \"%s\"\nStop\n",GetName(),buffs.Data());
+  if (!buffs.BeginsWith("END DIPOLE") || !buffs.Contains(GetName())) {
+    Error("LoadData","Expected: \"END DIPOLE\", found \"%s\"\nStop\n",buffs.Data());
     exit(1);
   }
   //
@@ -843,6 +842,49 @@ void AliMagWrapCheb::AddParamDip(const AliCheb3D* param)
   //
 }
 
+//__________________________________________________________________________________________
+void AliMagWrapCheb::ResetDip()
+{
+  // clean Dip field (used for update)
+  if (fNParamsDip) {
+    delete   fParamsDip;  fParamsDip = 0;
+    delete[] fSegZDip;    fSegZDip   = 0;
+    delete[] fSegXDip;    fSegXDip   = 0;
+    delete[] fSegYDip;    fSegYDip   = 0;
+    delete[] fBegSegYDip; fBegSegYDip = 0;
+    delete[] fNSegYDip;   fNSegYDip   = 0;
+    delete[] fBegSegXDip; fBegSegXDip = 0;
+    delete[] fNSegXDip;   fNSegXDip   = 0;
+    delete[] fSegIDDip;   fSegIDDip   = 0;   
+  }
+  fNParamsDip = fNZSegDip = fNXSegDip = fNYSegDip = 0;
+  fMinZDip = 1e6;
+  fMaxZDip = -1e6;
+  //
+}
+
+//__________________________________________________________________________________________
+void AliMagWrapCheb::ResetSol()
+{
+  // clean Sol field (used for update)
+  if (fNParamsSol) {
+    delete   fParamsSol;  fParamsSol = 0;
+    delete[] fSegZSol;    fSegZSol   = 0;
+    delete[] fSegPSol;    fSegPSol   = 0;
+    delete[] fSegRSol;    fSegRSol   = 0;
+    delete[] fBegSegPSol; fBegSegPSol = 0;
+    delete[] fNSegPSol;   fNSegPSol   = 0;
+    delete[] fBegSegRSol; fBegSegRSol = 0;
+    delete[] fNSegRSol;   fNSegRSol   = 0;
+    delete[] fSegIDSol;   fSegIDSol   = 0;   
+  }
+  fNParamsSol = fNZSegSol = fNPSegSol = fNRSegSol = 0;
+  fMinZSol = 1e6;
+  fMaxZSol = -1e6;
+  fMaxRSol = 0;
+  //
+}
+
 //__________________________________________________________________________________________
 void AliMagWrapCheb::ResetTPCInt()
 {

diff --git a/STEER/STEERBase/AliMagWrapCheb.h b/STEER/STEERBase/AliMagWrapCheb.h
index 0285dcd136cb3cf36d4a14a4999c0db1615a37f8..b74fc9526c3ccfccbfa449b912a12c1c2a741dbe 100644 (file)
--- a/STEER/STEERBase/AliMagWrapCheb.h
+++ b/STEER/STEERBase/AliMagWrapCheb.h
@@ -40,7 +40,7 @@
 #include <TMath.h>
 #include <TNamed.h>
 #include <TObjArray.h>
-class AliCheb3D;
+#include "AliCheb3D.h"
 
 class TSystem;
 class TArrayF;
@@ -136,6 +136,8 @@ class AliMagWrapCheb: public TNamed
   void       BuildTableTPCRatInt();
   void       ResetTPCInt();
   void       ResetTPCRatInt();
+  void       ResetSol();
+  void       ResetDip();
   //
   //
 #endif