Changeset 188 for trunk/3DEES/classifier.v

Timestamp:

Mar 25, 2014, 12:44:12 AM (10 years ago)

Author:

demin

Message:

fix bin numbers

File:

• trunk/3DEES/classifier.v (modified) (6 diffs)

trunk/3DEES/classifier.v

@@ -13 +13 @@
 
         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 +69 @@
                         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 +153 @@
                                 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 +165 @@
                         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 +211 @@
                                 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 +231 @@
 //      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];