From c50747542f074bd0c3cae1ccc20daec4891e274f Mon Sep 17 00:00:00 2001 From: Francis Russell Date: Wed, 4 Apr 2012 12:15:43 +0100 Subject: [PATCH] More work on PPDFunctionSet. --- src/ofc/generators/onetep/PPDFunctionSet.scala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ofc/generators/onetep/PPDFunctionSet.scala b/src/ofc/generators/onetep/PPDFunctionSet.scala index bea3b71..f35aee0 100644 --- a/src/ofc/generators/onetep/PPDFunctionSet.scala +++ b/src/ofc/generators/onetep/PPDFunctionSet.scala @@ -22,8 +22,16 @@ class PPDFunctionSet(val basisName: String, dataName: String) extends FunctionSe val a2pos = (ppdGlobalCount % (cellWidthInPPDs(0)*cellWidthInPPDs(1)))/cellWidthInPPDs(0) val a1pos = ppdGlobalCount % cellWidthInPPDs(0) + val ppdPos = List(a1pos, a2pos, a3pos) + + val tightbox = basis~>FieldSymbol("tight_boxes")(sphereIndex) + val ppdStartOffsets = for(dim <- 1 to 3) yield tightbox % FieldSymbol("start_pts"+dim) + val ppdFinishOffsets = for(dim <- 1 to 3) yield tightbox % FieldSymbol("finish_pts"+dim) + + val startPPDs = for(dim <- 0 to 2) yield (tightbox % FieldSymbol("start_ppd"+(dim+1)) + cellWidthInPPDs(dim)) % cellWidthInPPDs(dim) + val finishPPDs = for(dim <- 0 to 2) yield (tightbox % FieldSymbol("finish_ppd"+(dim+1)) + cellWidthInPPDs(dim)) % cellWidthInPPDs(dim) + //val ppdRanges = for(dim <- 0 to 2) yield producer.addIteration("point"+(dim+1), ppdWidths(dim)) - val tightbox = basis~>FieldSymbol("tight_boxes") producer } -- 2.47.3