Changeset 11269 for trunk/FACT++

Timestamp:

07/06/11 17:19:53 (13 years ago)

Author:

tbretz

Message:

Moved calling of RemoveAllServices from RemoveAllServers and RemoveServer to DimServiceInfoList and changed FITS ValueType for bytes from 'S' to 'B'

File:

• trunk/FACT++/src/datalogger.cc (modified) (5 diffs)

trunk/FACT++/src/datalogger.cc

@@ -386 +386 @@
     void RemoveAllServices(const string&);
     ///Remove a server and all of its services
-    void RemoveServer(const std::string &s);
+    //void RemoveServer(const std::string &s);
     ///Remove all the servers and all subscriptions
-    void RemoveAllServers();
+    //void RemoveAllServers();
 }; //DataLogger
 
@@ -536 +536 @@
     fNumSubAndFitsData.numSubscriptions -= fServiceSubscriptions[server].size();
     fServiceSubscriptions[server].clear();
+    fServiceSubscriptions.erase(server)
     if (fDebugIsOn)
     {
@@ -541 +542 @@
     }
 }
-// --------------------------------------------------------------------------
+/*
+ // --------------------------------------------------------------------------
 //
 //! Remove a given server
@@ -562 +564 @@
     fServiceSubscriptions.clear();
     DimServiceInfoList::RemoveAllServers();
-}
+    }*/
+
 // --------------------------------------------------------------------------
 //
@@ -2114 +2117 @@
          switch (flist[i].first.first->name()[0])
          {
-         case 'c': dataQualifier << "S"; break;
-         case 's': dataQualifier << "I"; break;
-         case 'i': dataQualifier << "J"; break;
-         case 'l': dataQualifier << "J"; break;
-         case 'f': dataQualifier << "E"; break;
-         case 'd': dataQualifier << "D"; break;
-         case 'x': dataQualifier << "K"; break;
+         case 'c': dataQualifier << 'B'; break;
+         case 's': dataQualifier << 'I'; break;
+         case 'i': dataQualifier << 'J'; break;
+         case 'l': dataQualifier << 'J'; break;
+         case 'f': dataQualifier << 'E'; break;
+         case 'd': dataQualifier << 'D'; break;
+         case 'x': dataQualifier << 'K'; break;
          case 'S': //we skip the variable length strings
              continue;