Changeset 1295 for trunk/src

Timestamp:

11/06/06 22:22:03 (18 years ago)

Author:

mar637

Message:

merge form Release2.1.1 branch

Location:

trunk/src

Files:

• LineCatalog.h (modified) (5 diffs)
• Makefile (modified) (2 diffs)
• RowAccumulator.h (modified) (1 diff)
• STAsciiWriter.cpp (modified) (1 diff)
• STMath.h (modified) (2 diffs)
• STWriter.cpp (modified) (5 diffs)
• Scantable.h (modified) (3 diffs)

trunk/src/LineCatalog.h

@@ -36 +36 @@
     */
   LineCatalog(const std::string& name = "jpl");
-  /**
-    * select a subset of the table by frequency range
-    * @param fmin the lower frequency bound
-    * @param fmin the upper frequency bound
-    */
 
   virtual ~LineCatalog() {}
@@ -50 +45 @@
    */
   void setFrequencyLimits(double fmin, double fmax);
+
   /**
     * select a subset of the table by line strength range
@@ -56 +52 @@
     */
   void setStrengthLimits(double smin, double smax);
+  
   /**
     * select a subset of the data by name pattern match (unix-style)
@@ -64 +61 @@
     */
   void setPattern(const std::string& name, const std::string& ptype="pattern");
+  
   /**
     * save the table  with current limits to disk (as an aips++ table)
@@ -69 +67 @@
     */
   void save(const std::string& name);
+  
   /**
     * Return a string representation of this table

trunk/src/Makefile

@@ -34 +34 @@
 
 G2CROOT := /usr/local
-G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
-G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
-G2CLIB := $(G2CROOT)/lib/libgfortran.a $(G2CARCH)
+G2CARCH := #$(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
+G2CLIB := $(G2CROOT)/lib/libg2c.a $(G2CARCH)
 
 # This assumes all casa libs are static only (*.a)
@@ -42 +41 @@
 CASAPPLIB := $(CASALIB)/version.o \
              -L$(CASALIB) \
-             -latnf -limages -lms -lcomponents -lcoordinates \
-             -llattices -lfits -lmeasures -lmeasures_f \
+             -latnf -lms -lcomponents -lcoordinates \
+             -llattices -lfits -lmeasures \
              -ltables -lscimath -lscimath_f -lcasa  \
              $(CASALIB)/libwcs.a \

trunk/src/RowAccumulator.h

@@ -43 +43 @@
     * @param tsys the Tsys corresponing to the spectrum
     * @param interval the intergration time
-    * @param the time of the observation
+    * @param time the time of the observation
     */
   void add(const casa::Vector<casa::Float>& v,

trunk/src/STAsciiWriter.cpp

@@ -109 +109 @@
     String fName = rootName + String(onstr) + String(".txt");
     ofstream of(fName.chars(), ios::trunc);
-    int row0 = t.rowNumbers()[0];
+    int row0 = t.rowNumbers(tab)[0];
     MDirection mdir = stable.getDirection(row0);
     of << setfill('#') << setw(70) << "" << setfill(' ') << endl;

trunk/src/STMath.h

@@ -51 +51 @@
 
   /**
-   * get the currnt @attr inistu state
+   * get the currnt @attr inistu_ state
    */
   bool insitu() const { return insitu_;};
@@ -65 +65 @@
     * average a vector of Scantables
     * @param in the vector of Scantables to average
-    * @param an optional mask to apply on specific weights
+    * @param mask an optional mask to apply on specific weights
     * @param weight weighting scheme
     * @param avmode the mode ov averaging. Per "SCAN" or "ALL".

trunk/src/STWriter.cpp

@@ -119 +119 @@
   //const Int nPol  = hdr.npol;
   //const Int nChan = hdr.nchan;
-  int nIF = in->nif();
+  std::vector<uint> ifs = in->getIFNos();
+  int nIF = in->nif();//ifs.size();
   Vector<uInt> nPol(nIF),nChan(nIF);
   Vector<Bool> havexpol(nIF);
-  for (int i=0;i<nIF;++i) {
-    nPol(i) = in->npol();
-    nChan(i) = in->nchan(i);
-    havexpol(i) = nPol(i) > 2;
+  nPol = 0;nChan = 0; havexpol = False;
+  for (int i=0;i<ifs.size();++i) {
+    nPol(ifs[i]) = in->npol();
+    nChan(ifs[i]) = in->nchan(ifs[i]);
+    havexpol(ifs[i]) = nPol(ifs[i]) > 2;
   }
 
@@ -170 +172 @@
       ROScalarColumn<Double> svelCol(btable, "SRCVELOCITY");
       svelCol.get(0, srcVel);
+      ROScalarColumn<uInt> bCol(btable, "BEAMNO");
+      beamno = bCol(0)+1;
       Int cycno = 1;
       while (!cycit.pastEnd() ) {
@@ -181 +185 @@
           const TableRecord& rec = row.get(0);
           ROArrayColumn<Float> specCol(itable, "SPECTRA");
+          ifno = rec.asuInt("IFNO")+1;
           uInt nchan = specCol(0).nelements();
           Double cdelt,crval,crpix, restfreq;
@@ -244 +249 @@
           }
           ++count;
-          ++ifno;
+          //++ifno;
           ++ifit;
         }
@@ -250 +255 @@
         ++cycit;
       }
-      ++beamno;
+      //++beamno;
       ++beamit;
     }

trunk/src/Scantable.h

@@ -120 +120 @@
   /**
    * set the header
-   * @param[in] sdh an STHeader object
+   * @param[in] sth an STHeader object
    */
   void setHeader( const STHeader& sth );
@@ -175 +175 @@
         /**
          * set the direction type as a string, e.g. "J2000"
-         * @param[in] the direction type
+         * @param[in] refstr the direction type
          */
   void setDirectionRefString(const std::string& refstr="");
@@ -203 +203 @@
   /**
    * Set the Stokes type of the data
-   * @param a string representing the type, e.g "circular" or "linear"
+   * @param feedtype a string representing the type, e.g "circular" or "linear"
    */
   void setFeedType( const std::string& feedtype );