Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11201)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11202)
@@ -1227,27 +1227,4 @@
          */
 
-        bool     ok_verno;
-        bool     ok_runno;
-       // uint16_t ok_bitmask;
-/*
-        const vector<uint16_t> verno = CheckVals(fadhd, &fadhd->version_no, ok_verno);
-        const vector<uint32_t> runno = CheckVals(fadhd, &fadhd->runnumber,  ok_runno);
-       // const vector<uint8_t>  bitmask = CheckBits(fadhd, &fadhd->PLLLCK,     ok_bitmask);
-
-        static vector<uint16_t> fStoreVersion;
-
-        if (verno!=fStoreVersion)
-        {
-            vector<float> data(40);
-            for (int i=0; i<40; i++)
-            {
-                ostringstream ver;
-                ver << (verno[i]&0xff) << '.' << (verno[i]>>8); // WARNING: No byte-swap yet!
-                data[i] = atof(ver.str().c_str());
-            }
-            fDimFwVersion.Update(data);
-            fStoreVersion=verno;
-        }
-*/
         /*
          uint16_t start_package_flag;
@@ -1347,14 +1324,4 @@
         //   array[4] enthaelt wieviele bytes im Buffer aktuell belegt sind; daran
         //   kannst Du pruefen, ob die 100MB voll sind ....
-
-        /*
-         stat[0]= qwait;
-         stat[1]= qskip;
-         stat[2]= qdel ;
-         stat[3]= qtot ;
-         stat[4]= gi_usedMem ;
-         stat[5]= qread;
-         stat[6]= qconn;
-         */
 
         ostringstream str;
@@ -1520,4 +1487,16 @@
         }
 
+        if (old.fDNA != h.fDNA || changed)
+        {
+            const boost::array<uint64_t,42> dna = Compare(&h, &h.fDNA);
+            Update(fDimDNA, dna, 40);
+        }
+
+        if (old.fStatus != h.fStatus || changed)
+        {
+            const boost::array<uint16_t,42> sts = CompareBits(&h, &h.fStatus);
+            Update(fDimStatus, sts);
+        }
+
         /*
          uint16_t fTriggerType;
@@ -1529,26 +1508,7 @@
          uint16_t fTriggerGeneratorPrescaler;
          uint32_t fTimeStamp;
-         uint32_t fRunNumber;
          int16_t  fTempDrs[kNumTemp];   // In units of 1/16 deg(?)
          uint16_t fDac[kNumDac];
          */
-
-        if (old.fTriggerType != h.fTriggerType || changed)
-        {
-            const boost::array<uint16_t,42> typ = Compare(&h, &h.fTriggerType);
-            //Print("Typ", typ);
-        }
-
-        if (old.fDNA != h.fDNA || changed)
-        {
-            const boost::array<uint64_t,42> dna = Compare(&h, &h.fDNA);
-            Update(fDimDNA, dna, 40);
-        }
-
-        if (old.fStatus != h.fStatus || changed)
-        {
-            const boost::array<uint16_t,42> sts = CompareBits(&h, &h.fStatus);
-            Update(fDimStatus, sts);
-        }
     }
 };