X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackerConditionDataMaker.cxx;h=7e46775c7736055b894bf2761467fa113d5b0c67;hb=41bb661bd6f49687c23c5327678f8145c0e7bc56;hp=7e949dd00a7bed6fd7bdca5d5c506fe4bc2c2f01;hpb=9641f73aa7674d4c2bfc38d99cf234ebb13b5868;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTrackerConditionDataMaker.cxx b/MUON/AliMUONTrackerConditionDataMaker.cxx index 7e949dd00a7..7e46775c773 100644 --- a/MUON/AliMUONTrackerConditionDataMaker.cxx +++ b/MUON/AliMUONTrackerConditionDataMaker.cxx @@ -60,7 +60,8 @@ ClassImp(AliMUONTrackerConditionDataMaker) AliMUONTrackerConditionDataMaker::AliMUONTrackerConditionDataMaker(): AliMUONVTrackerDataMaker(), fData(0x0), -fSource("") +fSource(""), +fIsOwnerOfData(kTRUE) { /// default ctor to be able to stream } @@ -69,7 +70,8 @@ fSource("") AliMUONTrackerConditionDataMaker::AliMUONTrackerConditionDataMaker(Int_t runNumber, const char* ocdbPath, const char* type): AliMUONVTrackerDataMaker(), fData(0x0), -fSource(Form("%s-%010d-%s",ocdbPath,runNumber,type)) +fSource(Form("%s-%010d-%s",ocdbPath,runNumber,type)), +fIsOwnerOfData(kTRUE) { /// ctor from OCDB @@ -95,7 +97,8 @@ fSource(Form("%s-%010d-%s",ocdbPath,runNumber,type)) AliMUONTrackerConditionDataMaker::AliMUONTrackerConditionDataMaker(const char* filename, const char* type): AliMUONVTrackerDataMaker(), fData(0x0), -fSource(Form("%s-%s",filename,type)) +fSource(Form("%s-%s",filename,type)), +fIsOwnerOfData(kTRUE) { /// ctor from an ASCII file @@ -129,7 +132,9 @@ fSource(Form("%s-%s",filename,type)) AliMUONTrackerConditionDataMaker::AliMUONTrackerConditionDataMaker(const char* data, const char* type, Bool_t) : AliMUONVTrackerDataMaker(), fData(0x0), -fSource(Form("direct-%s",type)) +fSource(Form("direct-%s",type)), +fIsOwnerOfData(kTRUE) + { /// ctor from a string containing the ASCII data /// the last parameter is there just to distinguish this ctor from the previous one @@ -150,7 +155,7 @@ fSource(Form("direct-%s",type)) AliMUONTrackerConditionDataMaker::~AliMUONTrackerConditionDataMaker() { /// dtor - delete fData; + if ( fIsOwnerOfData ) delete fData; }