Merge pull request #919 from tpersson/docAndBVflag

Fixes the BV flag for crab and the ref in doc.
MethodicalAcceleratorDesign · Jul 19, 2020 · 1edd948 · 1edd948
2 parents 48d32bd + a069c34
commit 1edd948
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/latexuguide/biblio-mad.bib b/doc/latexuguide/biblio-mad.bib
@@ -353,7 +353,7 @@ @TechReport{SXF
 @Misc{SixTrack-www,
 	title =   {{SixTrack website}},
     institution =  {CERN},
-    note =   {\href{http://cern.ch/sixtrack}{http://cern.ch/sixtrack}}}
+    note =   {\url{http://cern.ch/sixtrack}}}
 
 @TechReport{SixTrack,
   author = 	 {Frank Schmidt},
@@ -535,7 +535,7 @@ @TechReport{lebedev2010
   title = 	 {Betatron motion with coupling of horizontal and vertical degrees of motion},
   institution =  {Thomas Jefferson National Accelerator Facility},
   year = 	 2010,
-  note =         {\href{http://cern.ch/madx/doc/1748-0221_5_10_P10010.pdf}{PDF}}}
+  note =         {\url{http://cern.ch/madx/doc/1748-0221_5_10_P10010.pdf}}
 
 @TechReport{kapin2013,
 	author        = "Valery Kapin and Frank Schmidt",

diff --git a/src/twiss.f90 b/src/twiss.f90
@@ -8784,9 +8784,9 @@ SUBROUTINE tmcrab(fsec,ftrk,orbit,fmap,el,ek,re,te)
   elrad = node_value('lrad ')
   tilt = node_value('tilt ')
 
-  rfv = bvk * node_value('volt ')
+  rfv  = node_value('volt ')
   freq = node_value('freq ')
-  rfl = node_value('lag ')
+  rfl  = node_value('lag ')
 
   kn0l = rfv / pc / ten3p; ! MeV / 1d3 / GeV = rad
   pn0  = quarter + rfl; ! 2pi/4 + rfl