Changeset 2262 for branches/parallel/src

Timestamp:

08/04/11 12:58:21 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: No

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Preparation for check in tuning on NRO filler.
Merge changes in trunk.

r2154
r2156
r2158
r2198-2203
r2212
r2261

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/NROFiller.cpp (modified) (4 diffs)
• src/SConscript (modified) (1 prop)
• src/STFiller.cpp (modified) (2 diffs)

branches/parallel/src/NROFiller.cpp

@@ -75 +75 @@
   // 2010/07/30 TBD: Do we need to set frame here?
   table_->frequencies().setFrame( hdr.freqref, true ) ;
-  table_->frequencies().setFrame( String("LSRK"), false ) ;
+  table_->frequencies().setFrame( hdr.freqref, false ) ;
 
   // set Header
@@ -90 +90 @@
   uInt scanno ;
   uInt cycleno ;
+  uInt ifno ;
   uInt beamno ;
   uInt polno ;
@@ -153 +154 @@
                                scanno,
                                cycleno,
+                               ifno,
                                beamno,
                                polno,
@@ -212 +214 @@
 
     // SCANNO, CYCLENO, IFNO, POLNO, and BEAMNO
-    uInt ifno = table_->frequencies().addEntry( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
+    //uInt ifno = table_->frequencies().addEntry( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
     setIndex( scanno, cycleno, ifno, polno, beamno ) ;
 

branches/parallel/src/STFiller.cpp

@@ -634 +634 @@
   uInt scanno ;
   uInt cycleno ;
+  uInt iftmp ;
   uInt beamno ;
   uInt polno ;
@@ -691 +692 @@
                                   scanno,
                                   cycleno,
+                                  iftmp,
                                   beamno,
                                   polno,