Changeset 2288 for branches/parallel

Timestamp:

09/06/11 11:59:37 (13 years ago)

Author:

KohjiNakamura

Message:

dototalpower fixed

Location:

branches/parallel/src

Files:

• STMath.cpp (modified) (3 diffs)
• STMath.h (modified) (1 diff)

branches/parallel/src/STMath.cpp

@@ -979 +979 @@
                                               const CountedPtr< Scantable >& caloff, Float tcal )
 {
-if ( ! calon->conformant(*caloff) ) {
+  if ( ! calon->conformant(*caloff) ) {
     throw(AipsError("'CAL on' and 'CAL off' scantables are not conformant."));
   }
@@ -987 +987 @@
   const Table& tcon = calon->table();
   Vector<Float> tcalout;
-  Vector<Float> tcalout2;  //debug
-
-  const Table& subtcal = caloff->tcal().table();
-  static STMath::TcalIDmap mt1;
-  const Table& tout_const = caloff->table();
-  ROScalarColumn<uInt> outTcalIdCol(tout_const, "TCAL_ID");
-  Vector<uInt> vinID = outTcalIdCol.getColumn();
-  vector<unsigned int> vint,vintsub;
-  ROScalarColumn<uInt> outtcalSubIdCol(subtcal, "ID");
-  Vector<uInt> vinSubRowNo = outtcalSubIdCol.getColumn();
-  ROArrayColumn<Float> TCAL_Col(subtcal, "TCAL");
-  vector<unsigned int>::iterator ite_vint=vint.begin(),ite_vintsub=vintsub.begin();
-  vint.insert(ite_vint,vinID.begin(),vinID.end());
-  vintsub.insert(ite_vintsub,vinSubRowNo.begin(),vinSubRowNo.end());
-  mt1.insert(pair<vector<unsigned int>,vector<unsigned int> > (vint,vintsub) );
-  TcalIDmap::iterator ite_p;
-  ite_p = mt1.find(vint);
+
+  std::map<uInt,uInt> tcalIdToRecNoMap;
+  const Table& calOffTcalTable = caloff->tcal().table();
+  {
+    ROScalarColumn<uInt> calOffTcalTable_IDcol(calOffTcalTable, "ID");
+    const Vector<uInt> tcalIds(calOffTcalTable_IDcol.getColumn());
+    size_t tcalIdsEnd = tcalIds.nelements();
+    for (uInt i = 0; i < tcalIdsEnd; i++) {
+      tcalIdToRecNoMap[tcalIds[i]] = i;
+    }
+  }
+  ROArrayColumn<Float> calOffTcalTable_TCALcol(calOffTcalTable, "TCAL");
 
   if ( tout.nrow() != tcon.nrow() ) {
@@ -1074 +1069 @@
 **/
       // get tcal if input tcal <= 0
-      String tcalt;
       Float tcalUsed;
       tcalUsed = tcal;
       if ( tcal <= 0.0 ) {
-        // caloff->tcal().getEntry(tcalt, tcalout, tcalId);
-        uInt intTCAL = ite_p->second[(unsigned int)tcalId];
-        TCAL_Col.get(intTCAL,tcalout);
+        uInt tcalRecNo = tcalIdToRecNoMap[tcalId];
+        calOffTcalTable_TCALcol.get(tcalRecNo, tcalout);
 //         if (polno<=3) {
 //           tcalUsed = tcalout[polno];

branches/parallel/src/STMath.h

@@ -428 +428 @@
 
   bool insitu_;
-
-  typedef std::map<std::vector<unsigned int>,std::vector<unsigned int> > TcalIDmap;
 };