moved new() statements around to avoid potential memory leaks

Author: sdobbs

src/libraries/HDDM/DEventSourceREST.cc

@@ -620,8 +620,6 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
    {
 		if (locTAGMiter->getJtag() != tag)
 		 continue;
-
-		DBeamPhoton* gamma = new DBeamPhoton();
 
 		// load the counter number (if it exists) and set the energy based on the counter
 		unsigned int column = 0;
@@ -654,6 +652,8 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
 			continue;
 		}
 
+		DBeamPhoton* gamma = new DBeamPhoton();
+
 		double Elo_tagm = tagmGeom->getElow(column);
 		double Ehi_tagm = tagmGeom->getEhigh(column);
 		double Ebeam_tagm = (Elo_tagm + Ehi_tagm)/2.;
@@ -682,8 +682,6 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
       if (locTAGHiter->getJtag() != tag)
          continue;
 
-      DBeamPhoton* gamma = new DBeamPhoton();
-
 		// load the counter number (if it exists) and set the energy based on the counter
 		unsigned int counter = 0;
 		hddm_r::TaghChannelList &locTaghChannelList = locTAGHiter->getTaghChannels();
@@ -715,6 +713,8 @@ jerror_t DEventSourceREST::Extract_DBeamPhoton(hddm_r::HDDM *record,
 			continue;
 		}
 
+      	DBeamPhoton* gamma = new DBeamPhoton();
+
 		double Elo_tagh = taghGeom->getElow(counter);
 		double Ehi_tagh = taghGeom->getEhigh(counter);
 		double Ebeam_tagh = (Elo_tagh + Ehi_tagh)/2.;