Index: /experimental/components/FrameAssembler/src/FrameAssembler.cpp
===================================================================
--- /experimental/components/FrameAssembler/src/FrameAssembler.cpp	(revision 3964)
+++ /experimental/components/FrameAssembler/src/FrameAssembler.cpp	(revision 3970)
@@ -207,62 +207,49 @@
         }
 
-        switch ( operationalMode ) {
-        case ASSEMBLE_PREAMBLE:
-            DEBUG(4, FrameAssembler, "Assembling preamble")
-
-            // push
-            dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern);
-
-            // do not break; continue to assemble header
-            operationalMode = ASSEMBLE_HEADER;
-
-        case ASSEMBLE_HEADER:
-            DEBUG(4, FrameAssembler, "Assembling header")
-            // copy header
-            I_out_header.length(512);
-            Q_out_header.length(512);
-            AssembleHeader( I_header, Q_header );
-            for (unsigned int i=0; i<512; i++) {
-                I_out_header[i] = I_header[i];
-                Q_out_header[i] = Q_header[i];
+        // ASSEMBLE_PREAMBLE
+        DEBUG(4, FrameAssembler, "Assembling preamble")
+
+        // push
+        dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern);
+
+        // ASSEMBLE_HEADER
+        DEBUG(4, FrameAssembler, "Assembling header")
+        // copy header
+        I_out_header.length(512);
+        Q_out_header.length(512);
+        AssembleHeader( I_header, Q_header );
+        for (unsigned int i=0; i<512; i++) {
+            I_out_header[i] = I_header[i];
+            Q_out_header[i] = Q_header[i];
+        }
+
+        // push data
+        dataOut_0->pushPacket(I_out_header, Q_out_header);
+
+
+        // ASSEMBLE_FRAME
+        // break output into smaller pieces
+        
+        I_out_0.length(512);
+        Q_out_0.length(512);
+
+        j = 0;
+        for ( unsigned int i=0; i<frameSize; i++ ) {
+            I_out_0[j] = I_out_data[i];
+            Q_out_0[j] = Q_out_data[i];
+            j++;
+            
+            if ( j==blockSize || i==(frameSize-1) ) {
+                I_out_0.length(j);
+                Q_out_0.length(j);
+                dataOut_0->pushPacket(I_out_0, Q_out_0);
+                j=0;
             }
-
-            // push data
-            dataOut_0->pushPacket(I_out_header, Q_out_header);
-
-            // do not break; continue to assemble frame
-            operationalMode = ASSEMBLE_FRAME;
-
-        case ASSEMBLE_FRAME:
-            // break output into smaller pieces
-            std::cout << "Assembling frame symbols in blocks..." << std::endl;
-            
-            I_out_0.length(512);
-            Q_out_0.length(512);
-
-            j = 0;
-            for ( unsigned int i=0; i<frameSize; i++ ) {
-                I_out_0[j] = I_out_data[i];
-                Q_out_0[j] = Q_out_data[i];
-                j++;
-                
-                if ( j==blockSize || i==(frameSize-1) ) {
-                    I_out_0.length(j);
-                    Q_out_0.length(j);
-                    dataOut_0->pushPacket(I_out_0, Q_out_0);
-                    j=0;
-                }
-            }
-
-            operationalMode = ASSEMBLE_EOM_CODE;
-
-        case ASSEMBLE_EOM_CODE:
-            // push phasing pattern
-            ///\todo assemble EOM code
-            dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern);
-
-            operationalMode = ASSEMBLE_PREAMBLE;
-            break;
-        }
+        }
+
+        // ASSEMBLE_EOM_CODE:
+        // push phasing pattern
+        ///\todo assemble EOM code
+        dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern);
 
     }