Skip to content

Commit ddfc6f7

Browse files
committed
tweak dais file reading to ignore the gen files
1 parent 4d6fe91 commit ddfc6f7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/processes/prepare_mira_reports.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,11 @@ pub fn prepare_mira_reports_process(args: ReportsArgs) -> Result<(), Box<dyn Err
155155
}));
156156

157157
//Read in DAIS-ribosome data
158-
//let dais_ins_data = dais_insertion_data_collection(&args.irma_path)?;
159-
//let dais_del_data = dias_deletion_data_collection(&args.irma_path)?;
160-
//let dais_seq_data = dias_sequence_data_collection(&args.irma_path)?;
161-
//let dais_ref_data = dais_ref_seq_data_collection(&args.workdir_path, virus)?;
158+
let dais_ins_data = dais_insertion_data_collection(&args.irma_path)?;
159+
let dais_del_data = dias_deletion_data_collection(&args.irma_path)?;
160+
let dais_seq_data = dias_sequence_data_collection(&args.irma_path)?;
161+
//TODO: sc2 handling
162+
let dais_ref_data = dais_ref_seq_data_collection(&args.workdir_path, &args.virus)?;
162163

163164
//TODO: remove these at end
164165
//println!("{qc_config:?}")
@@ -174,7 +175,7 @@ pub fn prepare_mira_reports_process(args: ReportsArgs) -> Result<(), Box<dyn Err
174175

175176
//Calculate AA variants for aavars.csv and dais_vars.json
176177
//TODO: circle back for the rsv and sc2 situations
177-
//let dais_vars_data = compute_dais_variants(&dais_ref_data, &dais_seq_data)?;
178+
let dais_vars_data = compute_dais_variants(&dais_ref_data, &dais_seq_data)?;
178179
negative_qc_statement(
179180
"/home/xpa3/mira-oxide/test/qc_statement.json",
180181
&read_data,

src/utils/data_ingest.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ pub fn dais_insertion_data_collection(
677677
// Construct the glob pattern for matching files
678678
//If using * situation, you will have to use glob
679679
let pattern = format!(
680-
"{}/aggregate_outputs/dais-ribosome/*.ins",
680+
"{}/aggregate_outputs/dais-ribosome/DAIS_ribosome.ins",
681681
dais_path.as_ref().display()
682682
);
683683

@@ -708,7 +708,7 @@ pub fn dias_deletion_data_collection(
708708
// Construct the glob pattern for matching files
709709
//If using * situation, you will have to use glob
710710
let pattern = format!(
711-
"{}/aggregate_outputs/dais-ribosome/*.del",
711+
"{}/aggregate_outputs/dais-ribosome/DAIS_ribosome.del",
712712
dais_path.as_ref().display()
713713
);
714714

@@ -728,7 +728,6 @@ pub fn dias_deletion_data_collection(
728728
}
729729
}
730730
}
731-
732731
Ok(dais_del_data)
733732
}
734733

@@ -739,7 +738,7 @@ pub fn dias_sequence_data_collection(
739738
// Construct the glob pattern for matching files
740739
//If using * situation, you will have to use glob
741740
let pattern = format!(
742-
"{}/aggregate_outputs/dais-ribosome/*.seq",
741+
"{}/aggregate_outputs/dais-ribosome/DAIS_ribosome.seq",
743742
dais_path.as_ref().display()
744743
);
745744

0 commit comments

Comments
 (0)