Merge pull request #6545 from wm75/fix-irma

Fix wrapper name
galaxyproject · Nov 9, 2024 · 0ee665c · 0ee665c
2 parents a553789 + 3a1dd54
commit 0ee665c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tools/irma/irma.ml → tools/irma/irma.xml b/tools/irma/irma.ml → tools/irma/irma.xml
@@ -44,12 +44,13 @@ IRMA '${module}'
 resultDir &&
 ## IRMA does not write empty output files
 ## so the following script makes sure all expected outputs exist unconditionally
-python3 '$__tool_directory__/createMissingFiles.py'
+python3 '$__tool_directory__/createMissingFiles.py' &&
+cat irma_config.sh
     ]]></command>
     <configfiles>
         <configfile filename='irma_config.sh'><![CDATA[
 SINGLE_LOCAL_PROC=\${GALAXY_SLOTS:-1}
-DOUBLE_LOCAL_PROC=$((GALAXY_SLOTS/2 + (GALAXY_SLOTS==1)))
+DOUBLE_LOCAL_PROC=\$((SINGLE_LOCAL_PROC/2 + (SINGLE_LOCAL_PROC==1)))
 TMP=\$TMPDIR
 #if $advanced_config.customize == 'yes':
   #if $advanced_config.reference == 'yes':
@@ -277,7 +278,7 @@ SIG_LEVEL=$advanced_config.variant_calling.SIG_LEVEL
         </collection>
         <!-- optional outputs-->
         <collection name="bam_collection" type="list" label="Alignment files (bam)">
-            <filter>'bam' in optional_outputs</filter>
+            <filter>optional_outputs and 'bam' in optional_outputs</filter>
             <data name="PB1" format="bam" from_work_dir="resultDir/A_PB1.bam" label="PB1"/>
             <data name="PB2" format="bam" from_work_dir="resultDir/A_PB2.bam" label="PB2"/>
             <data name="PA" format="bam" from_work_dir="resultDir/A_PA.bam" label="PA"/>
@@ -288,7 +289,7 @@ SIG_LEVEL=$advanced_config.variant_calling.SIG_LEVEL
             <data name="NS" format="bam" from_work_dir="resultDir/A_NS.bam" label="NS"/>
         </collection>
         <collection name="vcf_collection" type="list" label="Variant calling files (VCF)">
-            <filter>'vcf' in optional_outputs</filter>
+            <filter>optional_outputs and 'vcf' in optional_outputs</filter>
             <data name="PB1" format="vcf" from_work_dir="resultDir/A_PB1.vcf" label="PB1"/>
             <data name="PB2" format="vcf" from_work_dir="resultDir/A_PB2.vcf" label="PB2"/>
             <data name="PA" format="vcf" from_work_dir="resultDir/A_PA.vcf" label="PA"/>