Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts: fourmess.c
2016-01-29 08:53:00 +01:00
parent a630a30294 5e597e2d10
commit 95988f331c
50 changed files with 183 additions and 201 deletions
--- a/fourmess.c
+++ b/fourmess.c
@ -393,7 +393,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon,
                               double fHkl[3], double fPosition[4], char *extra)
 {
  pFourMess priv = self->pPrivate;
-  float fSum, fSigma, fTemp, fMF, fStep, fPreset;
+  float fSum, fSigma, fTemp, fStep = .0, fPreset =.0, fMF;
  int i, iLF, iRet, iNP, ii;
  long *lCounts = NULL;
  pEVControl pEva = NULL;