Skip to content

Commit

Permalink
Build the crosstalk vignette on installation.
Browse files Browse the repository at this point in the history
This renames the vignette file, gives it a clearer title and sets it up
so that it gets rendered when the package in installed.
  • Loading branch information
mcol committed Feb 10, 2025
1 parent 5f084d9 commit 5cdffe2
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ Suggests:
rstudioapi (>= 0.16.0),
rjags (>= 4-15),
coda (>= 0.19-4),
knitr,
pander (>= 0.6.5),
testthat (>= 3.2.1),
vdiffr (>= 1.0.0),
tiff (>= 0.1-12),
devtools (>= 2.4.5),
R.rsp (>= 0.46.0)
VignetteBuilder: R.rsp
VignetteBuilder: R.rsp, knitr
Encoding: UTF-8
Language: en-US
RoxygenNote: 7.3.2
Expand Down
3 changes: 2 additions & 1 deletion NEWS.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ header-includes:

* `apply_Crosstalk()`, `calc_MoransI()`, `plot_SingleGrainDisc()` and
`plot_MoranScatterplot()` were contributed by Anna-Maartje de Boer and Luc
Steinbuch (#560).
Steinbuch (#560). An introductory example on how to use these functions
is available by executing `vignette("crosstalk")`.

* `calc_EED_Model()` models incomplete and heterogeneous bleaching of
mobile grains after Guibert et al. (2017). Along with the function, the
Expand Down
5 changes: 3 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

<!-- NEWS.md was auto-generated by NEWS.Rmd. Please DO NOT edit by hand!-->

# Changes in version 0.9.26.9000-110 (2025-02-07)
# Changes in version 0.9.26.9000-110 (2025-02-10)

## New functions

- `apply_Crosstalk()`, `calc_MoransI()`, `plot_SingleGrainDisc()` and
`plot_MoranScatterplot()` were contributed by Anna-Maartje de Boer and
Luc Steinbuch (#560).
Luc Steinbuch (#560). An introductory example on how to use these
functions is available by executing `vignette("crosstalk")`.

- `calc_EED_Model()` models incomplete and heterogeneous bleaching of
mobile grains after Guibert et al. (2017). Along with the function,
Expand Down
2 changes: 2 additions & 0 deletions vignettes/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.html
*.R
11 changes: 7 additions & 4 deletions vignettes/crosstalk_vignette.Rmd → vignettes/crosstalk.Rmd
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: "crosstalk_vignette"
title: "Assessing crosstalk in single-grain luminescence detection"
output:
rmarkdown::html_vignette:
toc: true
author: "Luc Steinbuch, Anna-Maartje de Boer, Wageningen University & Research, 2025"
date: "`r Sys.Date()`"
author: "Luc Steinbuch, Anna-Maartje de Boer, Wageningen University & Research"
date: "February 2025"
vignette: >
%\VignetteIndexEntry{crosstalk_vignette}
%\VignetteEngine{knitr::rmarkdown}
Expand All @@ -20,7 +20,10 @@ knitr::opts_chunk$set(

# Crosstalk

This vignette explores the crosstalk related functions in the "luminescence" package, related to research paper "A novel tool to assess crosstalk in single-grain luminescence detection", by Anna-Maartje de Boer, Luc Steinbuch, Gerard Heuvelink and Jakob Wallinga.
This vignette explores the crosstalk-related functions in the "Luminescence"
package, related to research paper "A novel tool to assess crosstalk in
single-grain luminescence detection", by Anna-Maartje de Boer, Luc Steinbuch,
Gerard Heuvelink and Jakob Wallinga.
Crosstalk in single-grain luminescence imaging (EMCCD) is the overlapping of luminescence signals from adjacent grains on a single-grain disc. The actual signal on one grain location influences the observed signal on a neighboring grain location which happens to be on the same measurement disc (one "position" in the reader). In this research and the shown functions, we define "neighboring" as rook-wise (horizontally and vertically) only, and we assume that all measurement discs have a regular grid of 10x10 grain locations.


Expand Down

3 comments on commit 5cdffe2

@RLumSK
Copy link
Member

@RLumSK RLumSK commented on 5cdffe2 Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to build this vignette on the fly? I had used R.rsp on purpose to avoid this build and enable longer calculations when required.

@mcol
Copy link
Contributor Author

@mcol mcol commented on 5cdffe2 Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I followed the standard R conventions. I think the advantage is that if the package changes, the vignette will generate an error if it fails to build, so we don't forget to keep it up to date. Luckily here the code runs quickly.

@RLumSK
Copy link
Member

@RLumSK RLumSK commented on 5cdffe2 Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This I understand, however, we could still build the vignette with RLumBuild but do not build it on CRAN. My past experience, I usually started with knitr, is that at some point it makes more sense to go back to R.rsp. I will leave the choice to you for now, but I wanted to mention it at least.

Please sign in to comment.