merge needed because previous merge broke the build

Merge branch 'master' into wavreadfix
wadpac · Aug 6, 2017 · ee2011f · ee2011f
2 parents 3e4006f + 67f2d2a
commit ee2011f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/R/g.calibrate.R b/R/g.calibrate.R
@@ -62,7 +62,7 @@ g.calibrate = function(datafile,use.temp=TRUE,spherecrit=0.3,minloadcrit=72,prin
 
     accread = g.readaccfile(filename=datafile,blocksize=blocksize,blocknumber=i,
                             selectdaysfile = selectdaysfile,filequality=filequality,
-                            decn=decn,dayborder=dayborder)
+                            decn=decn,dayborder=dayborder,ws=ws)
     P = accread$P
     filequality = accread$filequality
     filetooshort = filequality$filetooshort

diff --git a/man/g.sib.det.Rd b/man/g.sib.det.Rd
@@ -32,7 +32,8 @@
     See \link{g.part3}
   }
   \item{acc.metric}{
-    Which one of the metrics do you want to consider to analyze L5. The metric of interest need to be calculated in M (see \link{g.part1})
+    Which one of the metrics do you want to consider to analyze L5. The metric of
+    interest need to be calculated in M (see \link{g.part1})
   }
   \item{desiredtz}{
   See \link{g.part3}