Changeset 11496 for trunk/FACT++/src

Timestamp:

07/20/11 18:49:32 (13 years ago)

Author:

tbretz

Message:

Optimized ToFits according to the result of the optimization of the MFits reader.

File:

• trunk/FACT++/src/Converter.cc (modified) (3 diffs)

trunk/FACT++/src/Converter.cc

@@ -875 +875 @@
    const char *charSrc  = static_cast<const char*>(src);
 
-   for (Converter::FormatList::const_iterator i=fList.begin(); i!=fList.end(); i++)
+   // We skip the last element 'v'
+   for (Converter::FormatList::const_iterator i=fList.begin(); i!=fList.end()-1; i++)
    {
-       if (charDest-size>dest/* || charSrc-size>src*/)
+       /*
+        // For speed reasons we don't do a check in the loop
+       if (charDest-size>dest || charSrc-size>src)
        {
            ostringstream err;
@@ -883 +886 @@
            throw runtime_error(err.str());
        }
-
+       */
+
+       // Skip strings (must be the last, so we could just skip it)
        const char type = i->first.first->name()[0];
-       if (type=='v')
-           break;
-
        if (type=='S')
        {
            charSrc += strlen(charSrc)+1;
            continue;
-
-           // copy string until termination
-           // while (*charSrc)
-           //     *charDest++ = *charSrc++;
-           //
-           // *charDest++ = *charSrc++;
        }
-
-       // string types
-       if (string("bsilfdxc").find_first_of(type)==string::npos)
-           throw runtime_error(string("Type '")+type+"' not supported converting to FITS.");
 
        const int s = i->first.second;      // size of element
        const int n = i->second.first;      // number of elements
 
-       // for all elements of this column
-       for (int j=0; j<n; j++)
+       // Check if there are types with unknown sizes
+       if (s==0 || n==0)
+           throw runtime_error(string("Type '")+type+"' not supported converting to FITS.");
+
+       // Let the compiler do some optimization
+       switch (s)
        {
-           reverse_copy(charSrc,  charSrc+s, charDest);
-
-           charSrc  += s;
-           charDest += s;
+       case 1: memcpy(charDest, charSrc, s*n); charSrc+=s*n; charDest+=s*n; break;
+       case 2: for (int j=0; j<n; j++) { reverse_copy(charSrc, charSrc+2, charDest); charSrc+=2; charDest+=2; } break;
+       case 4: for (int j=0; j<n; j++) { reverse_copy(charSrc, charSrc+4, charDest); charSrc+=4; charDest+=4; } break;
+       case 8: for (int j=0; j<n; j++) { reverse_copy(charSrc, charSrc+8, charDest); charSrc+=8; charDest+=8; } break;
        }
    }
@@ -920 +916 @@
    {
        ostringstream err;
-       err << "Data block size (" << size << ") doesn't fit format description [fmt=" << fFormat << "]";
+       err << "ToFits - Data block size (" << size << ") doesn't fit format description [fmt=" << fFormat << "]";
        throw runtime_error(err.str());
    }