@@ -219,29 +219,31 @@ public Bank getDataBankADC(String name, DetectorType type){
219219
220220 Bank adcBANK = new Bank (schemaFactory .getSchema (name ),
221221 adcDGTZ .stream ().mapToInt (b -> b .getADCSize ()).sum ());
222-
222+
223+ int row = 0 ;
223224 for (int i = 0 ; i < adcDGTZ .size (); i ++){
224225 for (int j = 0 ; j <adcDGTZ .get (i ).getADCSize (); j ++) {
225- adcBANK .putByte ( 0 , i , (byte ) adcDGTZ .get (i ).getDescriptor ().getSector ());
226- adcBANK .putByte ( 1 , i , (byte ) adcDGTZ .get (i ).getDescriptor ().getLayer ());
227- adcBANK .putShort (2 , i , (short ) adcDGTZ .get (i ).getDescriptor ().getComponent ());
228- adcBANK .putByte ( 3 , i , (byte ) adcDGTZ .get (i ).getDescriptor ().getOrder ());
229- adcBANK .putInt ( 4 , i , adcDGTZ .get (i ).getADCData (j ).getADC ());
226+ adcBANK .putByte ( 0 , row , (byte ) adcDGTZ .get (i ).getDescriptor ().getSector ());
227+ adcBANK .putByte ( 1 , row , (byte ) adcDGTZ .get (i ).getDescriptor ().getLayer ());
228+ adcBANK .putShort (2 , row , (short ) adcDGTZ .get (i ).getDescriptor ().getComponent ());
229+ adcBANK .putByte ( 3 , row , (byte ) adcDGTZ .get (i ).getDescriptor ().getOrder ());
230+ adcBANK .putInt ( 4 , row , adcDGTZ .get (i ).getADCData (j ).getADC ());
230231 if (type == DetectorType .BMT || type == DetectorType .FMT || type == DetectorType .FTTRK ) {
231- adcBANK .putInt ( 4 , i , adcDGTZ .get (i ).getADCData (j ).getHeight ());
232- adcBANK .putInt ( 7 , i , adcDGTZ .get (i ).getADCData (j ).getIntegral ());
233- adcBANK .putLong (8 , i , adcDGTZ .get (i ).getADCData (j ).getTimeStamp ());
232+ adcBANK .putInt ( 4 , row , adcDGTZ .get (i ).getADCData (j ).getHeight ());
233+ adcBANK .putInt ( 7 , row , adcDGTZ .get (i ).getADCData (j ).getIntegral ());
234+ adcBANK .putLong (8 , row , adcDGTZ .get (i ).getADCData (j ).getTimeStamp ());
234235 }
235236 if (type == DetectorType .BAND ) {
236- adcBANK .putInt ( 5 , i , adcDGTZ .get (i ).getADCData (j ).getHeight ());
237- adcBANK .putFloat (6 , i , (float ) adcDGTZ .get (i ).getADCData (j ).getTime ());
238- adcBANK .putShort (7 , i , (short ) adcDGTZ .get (i ).getADCData (j ).getPedestal ());
237+ adcBANK .putInt ( 5 , row , adcDGTZ .get (i ).getADCData (j ).getHeight ());
238+ adcBANK .putFloat (6 , row , (float ) adcDGTZ .get (i ).getADCData (j ).getTime ());
239+ adcBANK .putShort (7 , row , (short ) adcDGTZ .get (i ).getADCData (j ).getPedestal ());
239240 }
240241 else {
241- adcBANK .putFloat (5 , i , (float ) adcDGTZ .get (i ).getADCData (j ).getTime ());
242- adcBANK .putShort (6 , i , (short ) adcDGTZ .get (i ).getADCData (j ).getPedestal ());
242+ adcBANK .putFloat (5 , row , (float ) adcDGTZ .get (i ).getADCData (j ).getTime ());
243+ adcBANK .putShort (6 , row , (short ) adcDGTZ .get (i ).getADCData (j ).getPedestal ());
243244 }
244- if (type == DetectorType .BST ) adcBANK .putLong (7 , i , adcDGTZ .get (i ).getADCData (j ).getTimeStamp ());
245+ if (type == DetectorType .BST ) adcBANK .putLong (7 , row , adcDGTZ .get (i ).getADCData (j ).getTimeStamp ());
246+ row ++;
245247 }
246248 }
247249 return adcBANK ;
0 commit comments