Changeset 242 in svn for trunk/src/VeryForward.cc

Timestamp:

Feb 5, 2009, 11:53:26 AM (16 years ago)

Author:

Xavier Rouby

Message:

memory leak free code

File:

• trunk/src/VeryForward.cc (modified) (4 diffs)

trunk/src/VeryForward.cc

@@ -21 +21 @@
 VeryForward::VeryForward() {
    DET = new RESOLution();
+   beamline1 = new H_BeamLine(1,500.);
+   beamline2 = new H_BeamLine(1,500.);
    init();
+  //Initialisation of Hector
+  relative_energy = true; // should always be true
+  kickers_on = 1;         // should always be 1
+
 }
 
@@ -27 +33 @@
    DET = new RESOLution();
    DET->ReadDataCard(DetDatacard);
+   beamline1 = new H_BeamLine(1,500.);
+   beamline2 = new H_BeamLine(1,500.);
    init();
+  //Initialisation of Hector
+  relative_energy = true; // should always be true
+  kickers_on = 1;         // should always be 1
+
 }
 
 VeryForward::VeryForward(const RESOLution * DetDatacard) {
    DET = new RESOLution(*DetDatacard);
+   beamline2 = new H_BeamLine(1,500.);
+   beamline1 = new H_BeamLine(1,500.);
+
    init();
+  //Initialisation of Hector
+  relative_energy = true; // should always be true
+  kickers_on = 1;         // should always be 1
+
 }
 
@@ -57 +76 @@
   // user should provide : (1) optics file for each beamline, and IPname,
   // and offset data (s,x) for optical elements
-  beamline1 = new H_BeamLine(1,500.);
   beamline1->fill("data/LHCB1IR5_v6.500.tfs",1,"IP5");
   beamline1->offsetElements(120,-0.097);
   H_RomanPot * rp220_1 = new H_RomanPot("rp220_1",220,2000); // RP 220m, 2mm, beam 1
   H_RomanPot * rp420_1 = new H_RomanPot("rp420_1",420,4000); // RP 420m, 4mm, beam 1
-  beamline1->add(rp220_1);
+  beamline1->add(rp220_1); 
   beamline1->add(rp420_1);
   
-  beamline2 = new H_BeamLine(1,500.);
   beamline2->fill("data/LHCB1IR5_v6.500.tfs",-1,"IP5");
   beamline2->offsetElements(120,+0.097);
@@ -72 +89 @@
   beamline2->add(rp220_2);
   beamline2->add(rp420_2); 
-  
+  // rp220_1, rp220_2, rp420_1 and rp420_2 will be deallocated in ~H_AbstractBeamLine
+  // do not put explicit delete
 }
+
 
 void VeryForward::ZDC(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchZDC,TRootGenParticle *particle)