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

Timestamp:

Feb 7, 2009, 6:48:45 PM (16 years ago)

Author:

severine ovyn

Message:

add parameters for RP

File:

• trunk/src/VeryForward.cc (modified) (1 diff)

trunk/src/VeryForward.cc

@@ -73 +73 @@
   relative_energy = true; // should always be true
   kickers_on = 1;         // should always be 1
-  
   // user should provide : (1) optics file for each beamline, and IPname,
   // and offset data (s,x) for optical elements
-  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->fill(DET->RP_beam1Card,1,"IP5");                                
+  beamline1->offsetElements(DET->RP_offsetEl_s,-DET->RP_offsetEl_x);
+  H_RomanPot * rp220_1 = new H_RomanPot("rp220_1",DET->RP_220_s,DET->RP_220_x*1E6); // RP 220m, 2mm, beam 1  
+  H_RomanPot * rp420_1 = new H_RomanPot("rp420_1",DET->RP_420_s,DET->RP_420_x*1E6); // RP 420m, 4mm, beam 1  
   beamline1->add(rp220_1); 
   beamline1->add(rp420_1);
   
-  beamline2->fill("data/LHCB1IR5_v6.500.tfs",-1,"IP5");
-  beamline2->offsetElements(120,+0.097);
-  H_RomanPot * rp220_2 = new H_RomanPot("rp220_2",220,2000);// RP 220m, 2mm, beam 2
-  H_RomanPot * rp420_2 = new H_RomanPot("rp420_2",420,4000);// RP 420m, 4mm, beam 2
+  beamline2->fill(DET->RP_beam2Card,-1,"IP5");                              
+  beamline2->offsetElements(DET->RP_offsetEl_s,+DET->RP_offsetEl_x);
+  H_RomanPot * rp220_2 = new H_RomanPot("rp220_2",DET->RP_220_s,DET->RP_220_x*1E6);// RP 220m, 2mm, beam 2     
+  H_RomanPot * rp420_2 = new H_RomanPot("rp420_2",DET->RP_420_s,DET->RP_420_x*1E6);// RP 420m, 4mm, beam 2     
   beamline2->add(rp220_2);
   beamline2->add(rp420_2);