obitools/obitools4
2
0
Fork 0
mirror of https://github.com/metabarcoding/obitools4.git synced 2025-06-29 16:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes to be committed:

Browse Source 
modified:   pkg/obioptions/version.go
	modified:   pkg/obitools/obitagpcr/pcrtag.go
This commit is contained in:
Eric Coissac
2024-11-04 14:30:17 +01:00
parent fc75974c68
commit 4b65bfce84
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/obioptions/version.go
View File

@ -7,7 +7,7 @@ import (
// TODO: The version number is extracted from git. This induces that the version
// corresponds to the last commit, and not the one when the file will be
// commited
var _Commit = "422f11c"
var _Commit = "fc75974"
var _Version = "Release 4.3.0"
// Version returns the version of the obitools package.

27
pkg/obitools/obitagpcr/pcrtag.go
View File

@ -64,7 +64,7 @@ func IPCRTagPESequencesBatch(iterator obiiter.IBioSequence,
newIter := obiiter.MakeIBioSequence()
newIter.MarkAsPaired()
f := func(iterator obiiter.IBioSequence, wid int) {
f := func(iterator obiiter.IBioSequence) {
arena := obialign.MakePEAlignArena(150, 150)
shifts := make(map[int]int)
@ -89,39 +89,46 @@ func IPCRTagPESequencesBatch(iterator obiiter.IBioSequence,
forward_match := annot["obimultiplex_forward_match"].(string)
forward_mismatches := annot["obimultiplex_forward_error"].(int)
forward_tag := annot["obimultiplex_forward_tag"].(string)
reverse_match := annot["obimultiplex_reverse_match"].(string)
reverse_mismatches := annot["obimultiplex_reverse_error"].(int)
reverse_tag := annot["obimultiplex_reverse_tag"].(string)
sample := annot["sample"].(string)
experiment := annot["experiment"].(string)
aanot := A.Annotations()
banot := B.Annotations()
if value, ok := annot["obimultiplex_forward_tag"]; ok {
forward_tag := value.(string)
aanot["obimultiplex_forward_tag"] = forward_tag
banot["obimultiplex_forward_tag"] = forward_tag
}
if value, ok := annot["obimultiplex_reverse_tag"]; ok {
reverse_tag := value.(string)
aanot["obimultiplex_reverse_tag"] = reverse_tag
banot["obimultiplex_reverse_tag"] = reverse_tag
}
aanot["obimultiplex_direction"] = direction
aanot["obimultiplex_forward_match"] = forward_match
aanot["obimultiplex_forward_mismatches"] = forward_mismatches
aanot["obimultiplex_forward_tag"] = forward_tag
aanot["obimultiplex_reverse_match"] = reverse_match
aanot["obimultiplex_reverse_mismatches"] = reverse_mismatches
aanot["obimultiplex_reverse_tag"] = reverse_tag
aanot["sample"] = sample
aanot["experiment"] = experiment
banot := B.Annotations()
banot["obimultiplex_direction"] = direction
banot["obimultiplex_forward_match"] = forward_match
banot["obimultiplex_forward_mismatches"] = forward_mismatches
banot["obimultiplex_forward_tag"] = forward_tag
banot["obimultiplex_reverse_match"] = reverse_match
banot["obimultiplex_reverse_mismatches"] = reverse_mismatches
banot["obimultiplex_reverse_tag"] = reverse_tag
banot["sample"] = sample
banot["experiment"] = experiment
@ -162,9 +169,9 @@ func IPCRTagPESequencesBatch(iterator obiiter.IBioSequence,
newIter.Add(nworkers)
for i := 1; i < nworkers; i++ {
go f(iterator.Split(), i)
go f(iterator.Split())
}
go f(iterator, 0)
go f(iterator)
go func() {
newIter.WaitAndClose()