Index: /tools/ddd/Functions.cpp
===================================================================
--- /tools/ddd/Functions.cpp	(revision 60)
+++ /tools/ddd/Functions.cpp	(revision 61)
@@ -92,9 +92,15 @@
       EventHeaderDisplay->clear();
       break;
-    default:
+    default:  // Print event header and trigger cell information from event data
       rewind(Tmpfile);
       QTextStream in(Tmpfile);
       QString text = in.readAll();
+      text.append("\nTrigger cells: ");
+      for (unsigned int i=0; i<RD->RHeader->NBoards*RD->RHeader->NChips; i++) {
+        QString a;
+        text.append(a.sprintf("%d ", *((int *)RD->Data + i)));
+      }
       EventHeaderDisplay->setPlainText(text);
+      
       // Case data in double format required by qwt library
       double* x = new double [RD->RHeader->Samples];
@@ -103,6 +109,6 @@
       for (unsigned int i=0; i<RD->RHeader->Samples; i++) {
       	x[i] = (double) (i/RD->BStruct[BoardNo->value()].NomFreq);
-        y[i] = (double) RD->Data[BoardNo->value()*RD->RHeader->NChips*RD->RHeader->NChannels *
-		 RD->RHeader->Samples+ChannelNo->value()*RD->RHeader->Samples+i]*RD->BStruct[BoardNo->value()].ScaleFactor;
+        y[i] = (double) *((short *) (RD->Data + RD->RHeader->NBoards*RD->RHeader->NChips*sizeof(int)) + BoardNo->value()*RD->RHeader->NChips*RD->RHeader->NChannels *
+		 RD->RHeader->Samples+ChannelNo->value()*RD->RHeader->Samples+i)*RD->BStruct[BoardNo->value()].ScaleFactor;
       }
       Signal->setData(x, y, RD->RHeader->Samples);
@@ -150,8 +156,14 @@
 	      for(int l=StartBin; l<(StopBin+1); l++){
 		
-		float sample = RD->Data[i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
+/* 		float sample = RD->Data[i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
 					j*RD->RHeader->NChannels*RD->RHeader->Samples+
 					k*RD->RHeader->Samples+
 					l]*RD->BStruct[i].ScaleFactor;
+ */
+ 		float sample = *((short *) (RD->Data + RD->RHeader->NBoards*RD->RHeader->NChips*sizeof(int)) + 
+		    	    	    	i*RD->RHeader->NChips*RD->RHeader->NChannels*RD->RHeader->Samples+
+					j*RD->RHeader->NChannels*RD->RHeader->Samples+
+					k*RD->RHeader->Samples+
+					l)*RD->BStruct[i].ScaleFactor;
 				
 		if (sample > z[binx][biny]) {