Fixing most memory errors

shahrukhqasim · Jul 31, 2018 · fff6b7b · fff6b7b
1 parent 4e7cbbe
commit fff6b7b
Show file tree

Hide file tree

Showing 53 changed files with 413 additions and 848 deletions.
diff --git a/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc b/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc
@@ -79,7 +79,7 @@ void dumpId (std::ostream& fOutput, DetId id) {
 }
 
 template <class T,class S> 
-bool getCastorObject (std::istream& fInput, T* fObject, S* fCondObject) {
+bool getCastorObject (std::istream& fInput, T* fObject) {
   if (!fObject) fObject = new T;
   char buffer [1024];
   while (fInput.getline(buffer, 1024)) {
@@ -96,7 +96,7 @@ bool getCastorObject (std::istream& fInput, T* fObject, S* fCondObject) {
 //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
 //    else
 //      {
-	fCondObject = new S(id, atof (items [4].c_str()), atof (items [5].c_str()), 
+    S* fCondObject = new S(id, atof (items [4].c_str()), atof (items [5].c_str()), 
 			   atof (items [6].c_str()), atof (items [7].c_str()));
 	fObject->addValues(*fCondObject);
 	delete fCondObject;
@@ -128,7 +128,7 @@ bool dumpCastorObject (std::ostream& fOutput, const T& fObject) {
 }
 
 template <class T,class S> 
-bool getCastorSingleFloatObject (std::istream& fInput, T* fObject, S* fCondObject) {
+bool getCastorSingleFloatObject (std::istream& fInput, T* fObject) {
   if (!fObject) fObject = new T;
   char buffer [1024];
   while (fInput.getline(buffer, 1024)) {
@@ -145,7 +145,7 @@ bool getCastorSingleFloatObject (std::istream& fInput, T* fObject, S* fCondObjec
 //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
 //    else
 //      {
-	fCondObject = new S(id, atof (items [4].c_str()) );
+	S* fCondObject = new S(id, atof (items [4].c_str()) );
 	fObject->addValues(*fCondObject);
 	delete fCondObject;
 	//      }
@@ -218,12 +218,12 @@ bool dumpCastorSingleIntObject (std::ostream& fOutput, const T& fObject) {
 }
 
 
-bool getObject (std::istream& fInput, CastorGains* fObject) {return getCastorObject (fInput, fObject, new CastorGain);}
+bool getObject (std::istream& fInput, CastorGains* fObject) {return getCastorObject<CastorGains,CastorGain> (fInput, fObject);}
 bool dumpObject (std::ostream& fOutput, const CastorGains& fObject) {return dumpCastorObject (fOutput, fObject);}
-bool getObject (std::istream& fInput, CastorGainWidths* fObject) {return getCastorObject (fInput, fObject, new CastorGainWidth);}
+bool getObject (std::istream& fInput, CastorGainWidths* fObject) {return getCastorObject<CastorGainWidths,CastorGainWidth> (fInput, fObject);}
 bool dumpObject (std::ostream& fOutput, const CastorGainWidths& fObject) {return dumpCastorObject (fOutput, fObject);}
 
-bool getObject (std::istream& fInput, CastorSaturationCorrs* fObject) {return getCastorSingleFloatObject (fInput, fObject, new CastorSaturationCorr);}
+bool getObject (std::istream& fInput, CastorSaturationCorrs* fObject) {return getCastorSingleFloatObject<CastorSaturationCorrs,CastorSaturationCorr> (fInput, fObject);}
 bool dumpObject (std::ostream& fOutput, const CastorSaturationCorrs& fObject) {return dumpCastorSingleFloatObject (fOutput, fObject);}
 
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHistos.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaHistos.h
@@ -348,11 +348,9 @@ class TEcnaHistos : public TObject {
 
   //..... Attributes
 
-  //  static  const  Int_t        fgMaxCar    = 512;   <== DANGEROUS !
-
-  Int_t fgMaxCar;                    // Max nb of caracters for char*
-  Int_t fZerv;                       // = 0 , for ViewHisto non used arguments
-  Int_t fUnev;                       // = 1 , for ViewHisto non used arguments
+  constexpr static int charArrLen = 512;  // Max nb of caracters for char*
+  Int_t fZerv;                            // = 0 , for ViewHisto non used arguments
+  Int_t fUnev;                            // = 1 , for ViewHisto non used arguments
 
 
   Int_t fCnaCommand, fCnaError;