Skip to content

Commit

Permalink
Dynamic samplename in fileseries/filepattern expressions (#542)
Browse files Browse the repository at this point in the history
* Dynamic samplename in fileseries/filepattern

* Documented change
  • Loading branch information
ArtemSokolov authored Mar 10, 2024
1 parent 7407281 commit 69ee2ef
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 8 deletions.
36 changes: 28 additions & 8 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
### 2024-03-10

* Allow for dynamic sample name specification in the fileseries/filepattern expressions.

For example, if the filenames are structured like this:
```
myproject/
markers.csv
params.yml
raw/
image1/
image1_ch1.tif
image1_ch2.tif
image2/
image2_ch1.tif
image2_ch2.tif
```

The corresponding expression can now be specified as `fileseries|.|pattern={samplename}_ch{channel}.tif`.

### 2024-02-25

* Added support for multiple samples in `raw/` subdirectory. If multiple images share the same markers and should be processed with the same set of parameters, they can be placed as subdirectories of `raw/`. In other words, instead of structuring the data as multiple projects:
Expand All @@ -7,15 +27,15 @@ image1/
markers.csv
params.yml
raw/
tile1.rcpnl
tile2.rcpnl
cycle1.rcpnl
cycle2.rcpnl
image2/
markers.csv
params.yml
raw/
tile1.rcpnl
tile2.rcpnl
cycle1.rcpnl
cycle2.rcpnl
```

they can be consolidated under the same project folder:
Expand All @@ -26,11 +46,11 @@ myproject/
params.yml
raw/
image1/
tile1.rcpnl
tile2.rcpnl
cycle1.rcpnl
cycle2.rcpnl
image2/
tile1.rcpnl
tile2.rcpnl
cycle1.rcpnl
cycle2.rcpnl
```

### 2024-01-31
Expand Down
1 change: 1 addition & 0 deletions modules/registration.nf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ process ashlar {
script:
// Options
def opts = Opts.moduleOpts(module, mcp)
.replace('{samplename}', sampleName)

// Images
def imgs = opts.contains("filepattern|") || opts.contains("fileseries|") ? "" :
Expand Down

0 comments on commit 69ee2ef

Please sign in to comment.