Skip to content

Commit 0abb550

Browse files
committed
added the option WISC2013 to the Capture_Type janno type
1 parent f5cbffa commit 0abb550

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
- New column `Chromosomal_Anomalies`.
1010
- Made column `Collection_ID` a list column.
1111
- Soft-retired the option `ReferenceGenome` in the column `Capture_Type`.
12-
- Added rescaling feature for the columns `Endogenous` and `Damage` for packages below Poseidon v3.0.0.. (TODO: Rethink the order in which that is done)
12+
- Added rescaling feature for the columns `Endogenous` and `Damage` for packages below Poseidon v3.0.0..
1313
- Made column `Damage` a list column.
14+
- Added the option `WISC2013` to the column `Capture_Type`.
1415
- Changed the handling of `_Note` columns. Previously they were explicitly specified and part of the `JannoRow` record type. Now they are just treated as arbitrary additional columns that get algorithmically sorted in when writing .janno files (e.g. in `forge`). See `makeHeaderWithAdditionalColumns`.
1516
- Changes to .ssf columns according to Poseidon v3.0.0:
1617
- New column `submitted_md5`.

src/Poseidon/ColumnTypesJanno.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ data JannoCaptureType =
408408
| ArborPrimePlus
409409
| ArborAncestralPlus
410410
| TwistAncientDNA
411+
| WISC2013
411412
| OtherCapture
412413
| LegacyReferenceGenome -- was removed in Poseidon v3.0.0, kept here for compatibility
413414
deriving (Eq, Ord, Generic, Enum, Bounded)
@@ -420,11 +421,13 @@ instance Makeable JannoCaptureType where
420421
| x == "ArborPrimePlus" = pure ArborPrimePlus
421422
| x == "ArborAncestralPlus" = pure ArborAncestralPlus
422423
| x == "TwistAncientDNA" = pure TwistAncientDNA
424+
| x == "WISC2013" = pure WISC2013
423425
| x == "OtherCapture" = pure OtherCapture
424426
| x == "ReferenceGenome" = pure LegacyReferenceGenome
425427
| otherwise = fail $ "Capture_Type is set to " ++ show x ++ ". " ++
426428
"That is not in the allowed set [Shotgun, 1240K, ArborComplete, \
427-
\ArborPrimePlus, ArborAncestralPlus, TwistAncientDNA, OtherCapture]."
429+
\ArborPrimePlus, ArborAncestralPlus, TwistAncientDNA, WISC2013, \
430+
\OtherCapture]."
428431
instance Suspicious JannoCaptureType where
429432
inspect LegacyReferenceGenome = Just ["Capture_Type is set to ReferenceGenome, which is not a \
430433
\capture setup. This option was retired in Poseidon v3.0.0."]
@@ -436,6 +439,7 @@ instance Show JannoCaptureType where
436439
show ArborPrimePlus = "ArborPrimePlus"
437440
show ArborAncestralPlus = "ArborAncestralPlus"
438441
show TwistAncientDNA = "TwistAncientDNA"
442+
show WISC2013 = "WISC2013"
439443
show OtherCapture = "OtherCapture"
440444
show LegacyReferenceGenome = "ReferenceGenome"
441445
instance Csv.ToField JannoCaptureType where toField x = Csv.toField $ show x

0 commit comments

Comments
 (0)