diff --git a/src/THcDC.cxx b/src/THcDC.cxx index 9bd76b22542cd2a7bb449c88af1cd051373076f8..5ba6fb2c8d95c8c52dc253f43ab0da12e23a1e1d 100644 --- a/src/THcDC.cxx +++ b/src/THcDC.cxx @@ -157,6 +157,8 @@ void THcDC::Setup(const char* name, const char* description) cout << "Created Drift Chamber " << i+1 << ", " << desc1 << endl; newchamber->SetHMSStyleFlag(fHMSStyleChambers); // Tell the chamber its style } + delete [] desc; + delete [] desc1; } //_____________________________________________________________________________ diff --git a/src/THcDetectorMap.cxx b/src/THcDetectorMap.cxx index a4ff120c9cc6dfe477596163af65859494b52acd..c6d25a0082faa05f4297597fafdc3842200b8155 100644 --- a/src/THcDetectorMap.cxx +++ b/src/THcDetectorMap.cxx @@ -315,6 +315,7 @@ void THcDetectorMap::Load(const char *fname) if(nvals==4) { signal= ((TObjString*)vararr->At(3))->GetString().Atoi(); } + delete vararr; // Discard result of Tokenize fTable[fNchans].roc=roc; fTable[fNchans].slot=slot; diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx index bf4b47e81f64a37775e364114ccbee3ee5392f18..7e7aee91d715dcb6d26b3b7afe0f855970e91f25 100644 --- a/src/THcHodoscope.cxx +++ b/src/THcHodoscope.cxx @@ -133,6 +133,7 @@ void THcHodoscope::Setup(const char* name, const char* description) fPlanes[i] = new THcScintillatorPlane(fPlaneNames[i], desc, i+1,fNPlanes,this); // Number planes starting from zero!! cout << "Created Scintillator Plane " << fPlaneNames[i] << ", " << desc << endl; } + delete [] desc; } //_____________________________________________________________________________ diff --git a/src/THcParmList.cxx b/src/THcParmList.cxx index b0ae38bca985e1fe52ee79f182a8338d12ef7a1c..56d46c43cc017cdbdb1eaf762fa3fb80f46a7b79 100644 --- a/src/THcParmList.cxx +++ b/src/THcParmList.cxx @@ -135,12 +135,12 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) current_comment.assign(line,pos+1,line.length()); line.erase(pos); // Strip off comment // Strip leading white space from comment - cout << "CommentA: " << current_comment << endl; + //cout << "CommentA: " << current_comment << endl; pos = current_comment.find_first_not_of(whtspc); if(pos!=string::npos && pos > 0 && pos < current_comment.length()) { current_comment.erase(0,pos); } - cout << "CommentB: " << current_comment << endl; + //cout << "CommentB: " << current_comment << endl; break; } } @@ -348,6 +348,11 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) } currentindex += nvals; // Remove old variable and recreate + if(existingtype == kDouble) { + delete [] (Double_t*) existingvar->GetValuePointer(); + } else if (existingtype == kInt) { + delete [] (Int_t*) existingvar->GetValuePointer(); + } RemoveName(varname); char *arrayname=new char [strlen(varname)+20]; sprintf(arrayname,"%s[%d]",varname,newlength); @@ -417,6 +422,8 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) delete[] arrayname; } + delete vararr; // Discard result of Tokenize + // cout << line << endl; } diff --git a/src/THcShower.cxx b/src/THcShower.cxx index 046f93e5c9da2b97460cefd6594e92e35f536242..9b32a64116f042ae077787b5c3876be38f8b1b0f 100644 --- a/src/THcShower.cxx +++ b/src/THcShower.cxx @@ -99,6 +99,7 @@ void THcShower::Setup(const char* name, const char* description) cout << "Created Shower Plane " << fLayerNames[i] << ", " << desc << endl; } + delete [] desc; cout << "THcShower::Setup Return " << GetName() << endl; }