// Author: Andreas Morsch <andreas.morsch@cern.ch>
//------------------------------------------------------------------------
+#include <TClass.h>
#include <TFile.h>
+#include <TMath.h>
#include <TSystem.h>
#include "AliLog.h"
delete fFieldMap[0];
delete fFieldMap[1];
delete fFieldMap[2];
- fgReadField = kTRUE;
}
//_______________________________________________________________________
//
// don't read twice
//
- if (!fgReadField) return;
- fgReadField = 0;
+ if (!fReadField) return;
+ fReadField = kFALSE;
//
- char* fname;
+
+
+ char* fname = 0;
TFile* file = 0;
if (fMap == k2kG) {
fSolenoid = 2.;
fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B02"));
file->Close();
delete file;
+ delete [] fname; // see documentation to expand filenam
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB02.root");
file = new TFile(fname);
fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB02"));
file->Close();
delete file;;
-
+ delete [] fname;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/ExtB02.root");
file = new TFile(fname);
fFieldMap[2] = dynamic_cast<AliFieldMap*>(file->Get("ExtB02"));
file->Close();
delete file;
+ delete [] fname;
} else if (fMap == k4kG) {
fSolenoid = 4.;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B04.root");
fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B04"));
file->Close();
delete file;
+ delete [] fname;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB04.root");
file = new TFile(fname);
fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB04"));
file->Close();
+ delete [] fname;
delete file;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/ExtB04.root");
file = new TFile(fname);
fFieldMap[2] = dynamic_cast<AliFieldMap*>(file->Get("ExtB04"));
file->Close();
+ delete [] fname;
delete file;
} else if (fMap == k5kG) {
fSolenoid = 5.;
file = new TFile(fname);
fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B05"));
file->Close();
- delete file;
+ delete file;
+ delete [] fname;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB05.root");
file = new TFile(fname);
fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB05"));
file->Close();
delete file;
-
+ delete [] fname;
fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/ExtB05.root");
file = new TFile(fname);
fFieldMap[2] = dynamic_cast<AliFieldMap*>(file->Get("ExtB05"));
file->Close();
delete file;
+ delete [] fname;
}
if (!fL3Option) fSolenoidUser = fSolenoid;
{
// Stream an object of class AliMagFMaps.
if (R__b.IsReading()) {
- AliMagFMaps::Class()->ReadBuffer(R__b, this);
- ReadField();
+ R__b.ReadClassBuffer(AliMagFMaps::Class(), this);
+ //
+ fReadField = kTRUE;
+ ReadField();
} else {
- AliMagFMaps::Class()->WriteBuffer(R__b, this);
+ R__b.WriteClassBuffer(AliMagFMaps::Class(), this);
}
}