From f45aabcc622d10ed2d158ab489c1944ea82b3cfb Mon Sep 17 00:00:00 2001
From: Alexandre Glazov <alexandre.glazov@desy.de>
Date: Wed, 15 Mar 2017 17:46:38 +0100
Subject: [PATCH 1/3] version name for tar file

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d04f94b84..420c189f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([XFitter],
-m4_esyscmd(git describe --always 2>&1 | awk '/Not a git/  {print "v2.0.0"}; !/Not a git/ {print $0}'  | tr -d '\n'),
+m4_esyscmd(git describe --always 2>&1 | awk '/Not a git/  {print "2.0.0\033@<:@1;32m FrozenFrog\033@<:@0m"}; !/Not a git/ {print $0}'  | tr -d '\n'),
 [xfitter-help@desy.de],[xfitter],[http://xfitter.org])
 m4_ifndef([AC_PACKAGE_URL], AC_DEFINE([PACKAGE_URL],["http://xfitter.org"]))
 
-- 
GitLab


From e982ea06b42bc94a04bd472865979c26aaa56f5f Mon Sep 17 00:00:00 2001
From: Alexandre Glazov <alexandre.glazov@desy.de>
Date: Wed, 15 Mar 2017 17:46:58 +0100
Subject: [PATCH 2/3] Improve drawing for tar version

---
 tools/draw/src/DrawLogo.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/draw/src/DrawLogo.cc b/tools/draw/src/DrawLogo.cc
index 329cfdf9b..0ff5cb742 100644
--- a/tools/draw/src/DrawLogo.cc
+++ b/tools/draw/src/DrawLogo.cc
@@ -49,6 +49,14 @@ TPad * DrawLogo(string pos)
 	  opts.version = false;
 	}
       else 
+	// first see if there is an escale character [ to indicate color. If yes, that is a sign of the release name. Draw it separately
+	if ( ver.find("[") !=std::string::npos ) {
+	  string release = ver.substr(ver.find("m ")+2,ver.find("0m")-ver.find("m ")-4);
+	  ver = ver.substr(0,ver.find("[")-1);
+	  // std::cout << release << " " << ver << std::endl;
+	  logo->DrawText(340, 80, release.c_str(), 80, 0, 
+		       font, TImage::kEmbossed);	  
+	};
 	logo->DrawText(200, 510, ver.c_str(), 80, 0, 
 		       font, TImage::kShadeBelow);
     }
-- 
GitLab


From 87ceffbcba5e60b038b8491602424876697cc6e1 Mon Sep 17 00:00:00 2001
From: Alexandre Glazov <alexandre.glazov@desy.de>
Date: Wed, 15 Mar 2017 17:47:46 +0100
Subject: [PATCH 3/3] Remove left-over function dip_csiim, not used

---
 DIPOLE/src/fit_sf_bes.f | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/DIPOLE/src/fit_sf_bes.f b/DIPOLE/src/fit_sf_bes.f
index 2262f0b92..5ea1f630e 100755
--- a/DIPOLE/src/fit_sf_bes.f
+++ b/DIPOLE/src/fit_sf_bes.f
@@ -327,24 +327,6 @@ C=         DIP_CS = sigma_proton(r,y) * SIGMA0
       RETURN
       END
 
-C--------------------------------------------------------------
-      Function dip_csiim(r,xx)
-C
-C Dipole cross section from Iancu, Itakura, Munier paper
-C
-      IMPLICIT REAL*8(A-H,O-Z)
-      common/pass1/ sig0,xlam,x0,xm,  cBGK, eBKG
-C-------------------------------------------------------------
-      Qs  = (x0/x)**(xlam/2)
-      rQs = r*Qs
-      
-      if (rQs.le.2) then
-         
-      else
-         aN = 1 - exp(aa)
-      endif
-
-      end
 c---------------------------------------------------------------
       FUNCTION R_02_sat(r,xx)
 c
-- 
GitLab