Index: trunk/3DEES/Paella.v
===================================================================
--- trunk/3DEES/Paella.v	(revision 187)
+++ trunk/3DEES/Paella.v	(revision 188)
@@ -292,9 +292,9 @@
 				.reset(1'b0),
 //				.del_data({6'd0, 6'd32, 6'd32, 6'd32}),
-				.del_data({6'd0, cfg_bits[41+6*j][5:0], cfg_bits[39+6*j][5:0], cfg_bits[37+6*j][5:0]}),
+				.del_data({6'd0, cfg_bits[43+6*j][5:0], cfg_bits[41+6*j][5:0], cfg_bits[39+6*j][5:0]}),
 				.amp_data({6'd0, 6'd20, 6'd20, 6'd20}),
 //				.tau_data({16'd0, 16'd19835, 16'd19835, 16'd19835}),
 // exp(-32/1000)*1024*20
-				.tau_data({16'd0, cfg_bits[40+6*j], cfg_bits[38+6*j], cfg_bits[36+6*j]}),
+				.tau_data({16'd0, cfg_bits[42+6*j], cfg_bits[40+6*j], cfg_bits[38+6*j]}),
 				.inp_data({
 					19'd0, cic_data[j*3+2][18:0], cic_data[j*3+1][18:0], cic_data[j*3+0][18:0]}),
@@ -340,5 +340,5 @@
 //			12'd20, 12'd20, 12'd20, 12'd20, 12'd2000, 12'd20,
 //			12'd20, 12'd2000, 12'd2000, 12'd20, 12'd1000, 12'd1000}),
-		.cfg_data({cfg_bits[33][11:0], cfg_bits[32][11:0],
+		.cfg_data({cfg_bits[37][11:0], cfg_bits[36][11:0],
 			cfg_bits[35][11:0], cfg_bits[34][11:0], cfg_bits[33][11:0], cfg_bits[32][11:0],
 			cfg_bits[31][11:0], cfg_bits[30][11:0], cfg_bits[29][11:0], cfg_bits[28][11:0],
Index: trunk/3DEES/UserInterface.tcl
===================================================================
--- trunk/3DEES/UserInterface.tcl	(revision 187)
+++ trunk/3DEES/UserInterface.tcl	(revision 188)
@@ -450,5 +450,5 @@
             set b $decay($i).0
             set value [expr int(exp(-${a}/${b})*1024*20)]
-            append command [format {000200%02x0004%04x} [expr {36 + 2 * (${i} - 1)}] $value]
+            append command [format {000200%02x0004%04x} [expr {38 + 2 * (${i} - 1)}] $value]
         }
 
@@ -463,5 +463,5 @@
         set command {}
         for {set i 1} {$i <= 6} {incr i} {
-            append command [format {000200%02x0004%04x} [expr {35 + 2 * (${i} - 1)}] $delay($i)]
+            append command [format {000200%02x0004%04x} [expr {39 + 2 * (${i} - 1)}] $delay($i)]
         }
 
Index: trunk/3DEES/classifier.v
===================================================================
--- trunk/3DEES/classifier.v	(revision 187)
+++ trunk/3DEES/classifier.v	(revision 188)
@@ -13,5 +13,5 @@
 
 	reg					out_flag_reg [2:0], out_flag_next [2:0];
-	reg		[7:0]		out_data_reg [2:0], out_data_next [2:0];
+	reg		[10:0]		out_data_reg [2:0], out_data_next [2:0];
 	reg		[5:0]		inp_flag_reg, inp_flag_next;
 	reg		[width-1:0]	inp_data_reg [5:0], inp_data_next [5:0];
@@ -69,5 +69,5 @@
 			for (i = 0; i < 3; i = i + 1)
 			begin
-				out_data_reg[i] <= {(7){1'b0}};
+				out_data_reg[i] <= {(11){1'b0}};
 				out_flag_reg[i] <= 1'b0;
 			end
@@ -153,5 +153,5 @@
 				for (i = 0; i < 3; i = i + 1)
 				begin
-					out_data_next[i] = {(7){1'b0}};
+					out_data_next[i] = {(11){1'b0}};
 					out_flag_next[i] = 1'b0;
 				end
@@ -165,7 +165,7 @@
 			else
 			begin
-				out_data_next[0] = {(7){1'b0}};		
+				out_data_next[0] = {(11){1'b0}};		
 				out_data_next[1] = out_data_reg[0];
-				out_data_next[2] = out_data_reg[1];
+				out_data_next[2] = {3'd0, out_data_reg[1][10:5], 2'd0} + {6'd0, out_data_reg[1][4:0]};
 
 				out_flag_next[0] = 1'b1;				
@@ -211,14 +211,14 @@
 				case (int_temp_reg[1][3:0])
 					// S1_F, electron
-					4'b0001: out_data_next[0][7:5] = 3'b100;
+					4'b0001: out_data_next[0][10:5] = 6'b100000;
 
 					// S1_F, proton
-					4'b0010: out_data_next[0][7:5] = 3'b101;
+					4'b0010: out_data_next[0][10:5] = 6'b100101;
 
 					// S1_S, electron
-					4'b0100: out_data_next[0][7:5] = 3'b110;
+					4'b0100: out_data_next[0][10:5] = 6'b101010;
 
 					// S1_S, proton
-					4'b1000: out_data_next[0][7:5] = 3'b111;
+					4'b1000: out_data_next[0][10:5] = 6'b101111;
 
 					default: out_flag_next[0] = 1'b0;
@@ -231,5 +231,5 @@
 //	assign out_data = {1'd0, int_comp_wire[0], int_temp_reg[1][3:0]};
 //	assign out_data = {1'd0, int_temp_reg[0][4:0]};
-	assign out_data = out_data_reg[2];
+	assign out_data = out_data_reg[2][7:0];
 	assign out_flag = out_flag_reg[2];
 
Index: trunk/3DEES/histogram32.v
===================================================================
--- trunk/3DEES/histogram32.v	(revision 187)
+++ trunk/3DEES/histogram32.v	(revision 188)
@@ -7,5 +7,5 @@
 
 		input	wire			bus_ssel, bus_wren,
-		input	wire	[6:0]	bus_addr,
+		input	wire	[7:0]	bus_addr,
 		input	wire	[15:0]	bus_mosi,