Changeset 238 in svn

Timestamp:

Feb 3, 2009, 2:35:44 PM (16 years ago)

Author:

Xavier Rouby

Message:

large memory leaks removed. other important change add(el) instead of add(*el)

File:

• trunk/Utilities/Hector/src/H_BeamLine.cc (modified) (1 diff)

trunk/Utilities/Hector/src/H_BeamLine.cc

@@ -194 +194 @@
                         }
 
-                        ap = 0; //init
-                        if(e.aper_1 !=0 || e.aper_2 !=0 || e.aper_3 !=0 || e.aper_4 != 0) {
-                                e.aper_1 *= URAD;
-                                e.aper_2 *= URAD;
-                                e.aper_3 *= URAD;
-                                e.aper_4 *= URAD; // in [m] in the tables !
-
-                                if(strstr(e.apertype.c_str(),"RECTELLIPSE")) ap = new H_RectEllipticAperture(e.aper_1,e.aper_2,e.aper_3,e.aper_4,0,0);
-                                else if(strstr(e.apertype.c_str(),"CIRCLE")) ap = new H_CircularAperture(e.aper_1,0,0);
-                                else if(strstr(e.apertype.c_str(),"RECTANGLE")) ap = new H_RectangularAperture(e.aper_1,e.aper_2,0,0);
-                                else if(strstr(e.apertype.c_str(),"ELLIPSE")) ap = new H_EllipticAperture(e.aper_1,e.aper_2,0,0);
-                        }
-
                         if(el!=0) {
+                                ap = 0; //init
+                                if(e.aper_1 !=0 || e.aper_2 !=0 || e.aper_3 !=0 || e.aper_4 != 0) {
+                                        e.aper_1 *= URAD;
+                                        e.aper_2 *= URAD;
+                                        e.aper_3 *= URAD;
+                                        e.aper_4 *= URAD; // in [m] in the tables !
+
+                                        if(strstr(e.apertype.c_str(),"RECTELLIPSE")) 
+                                                ap = new H_RectEllipticAperture(e.aper_1,e.aper_2,e.aper_3,e.aper_4,0,0);
+                                        else if(strstr(e.apertype.c_str(),"CIRCLE")) 
+                                                ap = new H_CircularAperture(e.aper_1,0,0);
+                                        else if(strstr(e.apertype.c_str(),"RECTANGLE")) 
+                                                ap = new H_RectangularAperture(e.aper_1,e.aper_2,0,0);
+                                        else if(strstr(e.apertype.c_str(),"ELLIPSE")) 
+                                                ap = new H_EllipticAperture(e.aper_1,e.aper_2,0,0);
+                                }
+        
                                 if (direction<0) {
-                                        el->setBetaX(e.betx);
-                                        el->setBetaY(e.bety);
-                                        el->setDX(e.dx);
-                                        el->setDY(e.dy);
-                                        el->setRelX(e.x);
-                                        el->setRelY(e.y);
+                                        el->setBetaX(e.betx);   el->setBetaY(e.bety);
+                                        el->setDX(e.dx);        el->setDY(e.dy);
+                                        el->setRelX(e.x);       el->setRelY(e.y);
                                 } else {
-                                        el->setBetaX(previous_betax);
-                                        el->setBetaY(previous_betay);
-                                        el->setDX(previous_dx);
-                                        el->setDY(previous_dy);
-                                        el->setRelX(previous_x);
-                                        el->setRelY(previous_y);
+                                        el->setBetaX(previous_betax);   el->setBetaY(previous_betay);
+                                        el->setDX(previous_dx);         el->setDY(previous_dy);
+                                        el->setRelX(previous_x);        el->setRelY(previous_y);
                                 }
                                 if(ap!=0) { 
-                                        el->setAperture(ap);  // makes a copy
-                                        delete ap; 
-                                }
+                                        el->setAperture(ap);
+                                        delete ap;
+                                        // if memory is allocated, i.e. if ap!=0,
+                                        // it wont be deallocated in H_OpticalElement::~H_OpticalElement
+                                        // ap should then be deleted here
+                                } // memory leak-free!
         
-                                /// Parses all the elements, but only keeps the ones from the IP till the desired length
-                                if(e.s>=0 && e.s<beam_length) add(*el);
-
-                        // delete el; // el deleted in H_AbstractBeamLine::~H_AbstractBeamLine
+                                /// Parses all the elements from the beginning of the file, 
+                                /// but only keeps the ones from the IP till the desired length
+                                if(e.s>=0 && e.s<beam_length) add(el);
+                                else { delete el;} 
+                                // NB : if "el" is added to the beamline, it will be 
+                                // deleted by H_AbstractBeamLine::~H_AbstractBeamLine
+                                // Otherwise, it should be deleted explicitly
+
                         } // if(el!=0)
                 } // if (found)