Changeset 396 for trunk

Timestamp:

02/09/05 13:00:12 (20 years ago)

Author:

kil064

Message:

add a secondary index argument to the SDDataDesc container

Location:

trunk/src

Files:

• SDContainer.cc (modified) (3 diffs)
• SDContainer.h (modified) (3 diffs)

trunk/src/SDContainer.cc

@@ -485 +485 @@
 // SDDataDesc
 
-uInt SDDataDesc::addEntry (const String& source, uInt freqID, const MDirection& dir)
+uInt SDDataDesc::addEntry (const String& source, uInt ID, 
+                           const MDirection& dir, uInt secID)
 {
 
@@ -492 +493 @@
   if (n_ > 0) {
     for (uInt i=0; i<n_; i++) {
-      if (source==source_[i] && freqID==freqID_[i]) {
+      if (source==source_[i] && ID==ID_[i]) {
          return i;
       }
@@ -502 +503 @@
   n_ += 1;
   source_.resize(n_,True);
-  freqID_.resize(n_,True);
-  dir_.resize(n_,True,True);
+  ID_.resize(n_,True);
+  secID_.resize(n_,True);
+  secDir_.resize(n_,True,True);
 //
   source_[n_-1] = source;
-  freqID_[n_-1] = freqID;
-  dir_[n_-1] = dir;
+  ID_[n_-1] = ID;
+  secID_[n_-1] = secID;
+  secDir_[n_-1] = dir;
 //
   return n_-1;
 }
 
-
 void SDDataDesc::summary() const
 {
-   cerr << "Source    FreqID" << endl;
-   for (uInt i=0; i<n_; i++) {
-      cerr << setw(11) << source_(i) << freqID_(i) << endl;
+   if (n_>0) {
+      cerr << "Source    ID" << endl;   
+      for (uInt i=0; i<n_; i++) {
+         cerr << setw(11) << source_(i) << ID_(i) << endl;
+      }
    }
 }
-
-

trunk/src/SDContainer.h

@@ -210 +210 @@
   ~SDDataDesc() {;}
 
-// Add an entry if source name (not direction at this point) and freqID are unique
-  casa::uInt addEntry (const casa::String& source, casa::uInt freqID,
-                       const casa::MDirection& dir);
+// Add an entry if source name and Integer ID (can be anything you like, such 
+// as FreqID) are unique.  You can add secondary entries direction
+// and another integer index which are just stored along with the
+// the primary entries
+  casa::uInt addEntry (const casa::String& source, casa::uInt ID,
+                       const casa::MDirection& secDir, casa::uInt secID);
 
 // Number of entries
@@ -219 +222 @@
 // Get attributes
   casa::String source (casa::uInt which) const {return source_[which];}
-  casa::uInt freqID(casa::uInt which) const {return freqID_[which];}
-  casa::MDirection direction (casa::uInt which) const {return dir_[which];}
+  casa::uInt ID(casa::uInt which) const {return ID_[which];}
+  casa::uInt secID(casa::uInt which) const {return secID_[which];}
+  casa::MDirection secDir (casa::uInt which) const {return secDir_[which];}
 
 // Summary
@@ -228 +232 @@
   casa::uInt n_;
   casa::Vector<casa::String> source_;
-  casa::Vector<casa::uInt> freqID_;
-  casa::Block<casa::MDirection> dir_;
+  casa::Vector<casa::uInt> ID_, secID_;
+  casa::Block<casa::MDirection> secDir_;
 //
   SDDataDesc(const SDDataDesc& other);