Changeset 2170 in Sophya for trunk/SophyaExt/FitsIOServer/fabtcolread.cc

Timestamp:

Aug 9, 2002, 3:03:41 PM (23 years ago)

Author:

cmv

Message:

long long et uint_2 cmv 9/8/02

File:

• trunk/SophyaExt/FitsIOServer/fabtcolread.cc (modified) (5 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -203 +203 @@
 
  // Get column type
- int ColTypeCode;
  if(fits_get_coltype(FitsPtr,ColNum+1,&ColTypeCode,NULL,NULL,&sta)) {
    printerror(sta); Delete();
@@ -441 +440 @@
 }
 
-/*! idem before but for TVector of int_4 */
-long FitsABTColRead::Read(long n1,long n2,TVector<int_4>& data)
+/*! idem before but for TVector of unsigned short */
+long FitsABTColRead::Read(long n1,long n2,TVector<uint_2>& data)
 {
  if(n1<0 || n1>=NBline)
@@ -454 +453 @@
  if(data.Size()<nread) data.SetSize(nread);
 
+ int sta=0;
+ fits_read_col(FitsPtr,TUSHORT,ColNum+1,n1+1,1,nread,NULL,data.Data(),NULL,&sta);
+ if(sta) {
+   printerror(sta);
+   throw NotAvailableOperation("FitsABTColRead::Read_TVector<uint_2>: Error Reading Fits file\n");
+ }
+
+ return nread;
+}
+
+/*! idem before but for TVector of int_4 */
+long FitsABTColRead::Read(long n1,long n2,TVector<int_4>& data)
+{
+ if(n1<0 || n1>=NBline)
+   throw RangeCheckError("FitsABTColRead::Read TVector bad requested 1srt line \n");
+ if(data.Size()<=0 && n2<n1)
+   throw RangeCheckError("FitsABTColRead::Read TVector bad requested 2sd line \n");
+ if(n2<0) n2 = n1 + data.Size()-1;
+ if(n2>=NBline) n2 = NBline-1;
+
+ sa_size_t nread = n2-n1+1;
+ if(data.Size()<nread) data.SetSize(nread);
+
  //for(long i=n1;i<=n2;i++) data(i-n1) = Read(i);
  int sta=0;
@@ -460 +482 @@
  if(sta) {
    printerror(sta);
-   throw NotAvailableOperation("FitsABTColRead::Read_TVector<float>: Error Reading Fits file\n");
+   throw NotAvailableOperation("FitsABTColRead::Read_TVector<int_4>: Error Reading Fits file\n");
  }
 
@@ -484 +506 @@
  if(sta) {
    printerror(sta);
-   throw NotAvailableOperation("FitsABTColRead::Read_TVector<float>: Error Reading Fits file\n");
+   throw NotAvailableOperation("FitsABTColRead::Read_TVector<int_8>: Error Reading Fits file\n");
  }