fixed some minors after merging master

poseidon-framework · Oct 25, 2024 · d8d2da8 · d8d2da8
1 parent d2ab538
commit d8d2da8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Poseidon/CLI/Forge.hs b/src/Poseidon/CLI/Forge.hs
@@ -20,7 +20,7 @@ import           Poseidon.GenotypeData       (GenoDataSource (..),
                                               printSNPCopyProgress,
                                               selectIndices, snpSetMergeList)
 import           Poseidon.Janno              (JannoRow (..), ListColumn (..),
-                                              JannoRows (..), getMaybeJannoList,
+                                              JannoRows (..), getMaybeListColumn,
                                               jannoRows2EigenstratIndEntries,
                                               writeJannoFile)
 import           Poseidon.Package            (PackageReadOptions (..),

diff --git a/src/Poseidon/Janno.hs b/src/Poseidon/Janno.hs
@@ -655,4 +655,5 @@ deriveGeneric ''JannoRow
 jannoRows2EigenstratIndEntries :: JannoRows -> [EigenstratIndEntry]
 jannoRows2EigenstratIndEntries (JannoRows jannoRows) = do -- list monad
     jannoRow <- jannoRows -- looping over jannoRows
-    return $ EigenstratIndEntry (jPoseidonID jannoRow) (sfSex (jGeneticSex jannoRow)) (head . getJannoList $ jGroupName jannoRow)
+    let GroupName gText = head . getListColumn . jGroupName $ jannoRow
+    return $ EigenstratIndEntry (jPoseidonID jannoRow) (sfSex (jGeneticSex jannoRow)) (T.unpack gText)