Skip to content

Commit e0402be

Browse files
committed
Remove debugging code
1 parent c61cbcf commit e0402be

File tree

3 files changed

+6
-44
lines changed

3 files changed

+6
-44
lines changed

SequenceAnalysis/resources/web/SequenceAnalysis/panel/AlignmentAnalysisPanel.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ Ext4.define('SequenceAnalysis.panel.AlignmentAnalysisPanel', {
8080

8181
this.libraryIds = Ext4.unique(libraryIds);
8282

83-
this.down('#alignmentCount').update('Alignments to be analyzed: ' + store.getCount());
83+
var target = this.down('#alignmentCount');
84+
if (target) {
85+
target.update('Alignments to be analyzed: ' + store.getCount());
86+
}
8487
}
8588
}
8689
});

singlecell/api-src/org/labkey/api/singlecell/pipeline/AbstractSingleCellPipelineStep.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ public static void executeR(SequenceOutputHandler.JobContext ctx, String dockerC
249249
}
250250

251251
File localBashScript = new File(ctx.getOutputDir(), "dockerWrapper.sh");
252-
File rWrapperScript = new File(ctx.getOutputDir(), "rWrapper.sh");
253252
try (PrintWriter writer = PrintWriters.getPrintWriter(localBashScript))
254253
{
255254
writer.println("#!/bin/bash");
@@ -283,7 +282,7 @@ public static void executeR(SequenceOutputHandler.JobContext ctx, String dockerC
283282
writer.println("\t-w /work \\");
284283
writer.println("\t-e HOME=/homeDir \\");
285284
writer.println("\t" + dockerContainerName + " \\");
286-
writer.println("\t/bin/bash " + rWrapperScript.getName());
285+
writer.println("\tRscript --vanilla " + localRScript.getName());
287286
writer.println("");
288287
writer.println("echo 'Bash script complete'");
289288

@@ -293,30 +292,11 @@ public static void executeR(SequenceOutputHandler.JobContext ctx, String dockerC
293292
throw new PipelineJobException(e);
294293
}
295294

296-
try (PrintWriter writer = PrintWriters.getPrintWriter(rWrapperScript))
297-
{
298-
writer.println("#!/bin/bash");
299-
writer.println("set -x");
300-
301-
writer.println("if Rscript --vanilla " + localRScript.getName());
302-
writer.println("then");
303-
writer.println("\texit 0");
304-
writer.println("else");
305-
writer.println("\techo \"Rscript exited with value $?\"");
306-
writer.println("\texit 0");
307-
writer.println("fi");
308-
}
309-
catch (IOException e)
310-
{
311-
throw new PipelineJobException(e);
312-
}
313-
314295
SimpleScriptWrapper rWrapper = new SimpleScriptWrapper(ctx.getLogger());
315296
rWrapper.setWorkingDir(ctx.getOutputDir());
316297
rWrapper.execute(Arrays.asList("/bin/bash", localBashScript.getName()));
317298

318299
localRScript.delete();
319-
rWrapperScript.delete();
320300
localBashScript.delete();
321301
}
322302

singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,11 +1249,9 @@ private File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, S
12491249
}
12501250

12511251
File localBashScript = new File(outputDir, "generateCallsDockerWrapper.sh");
1252-
File rWrapperScript = new File(outputDir, "generateCallsRWrapper.sh");
12531252
try (PrintWriter writer = PrintWriters.getPrintWriter(localBashScript))
12541253
{
12551254
writer.println("#!/bin/bash");
1256-
writer.println("set -e");
12571255
writer.println("set -x");
12581256
writer.println("WD=`pwd`");
12591257
writer.println("HOME=`echo ~/`");
@@ -1279,25 +1277,7 @@ private File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, S
12791277
writer.println("\t-w /work \\");
12801278
writer.println("\t-e HOME=/homeDir \\");
12811279
writer.println("\tghcr.io/bimberlab/cellhashr:latest \\");
1282-
writer.println("\t/bin/bash " + rWrapperScript.getName());
1283-
}
1284-
catch (IOException e)
1285-
{
1286-
throw new PipelineJobException(e);
1287-
}
1288-
1289-
try (PrintWriter writer = PrintWriters.getPrintWriter(rWrapperScript))
1290-
{
1291-
writer.println("#!/bin/bash");
1292-
writer.println("set -x");
1293-
1294-
writer.println("if Rscript --vanilla " + localRScript.getName());
1295-
writer.println("then");
1296-
writer.println("\texit 0");
1297-
writer.println("else");
1298-
writer.println("\techo \"Rscript exited with value $?\"");
1299-
writer.println("\texit 0");
1300-
writer.println("fi");
1280+
writer.println("\tRscript --vanilla " + localRScript.getName());
13011281
}
13021282
catch (IOException e)
13031283
{
@@ -1335,7 +1315,6 @@ private File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, S
13351315
}
13361316

13371317
localBashScript.delete();
1338-
rWrapperScript.delete();
13391318
localRScript.delete();
13401319

13411320
try

0 commit comments

Comments
 (0)