Change some log messages.

Pcie40Applications/main_pcie40_ul.c

@@ -84,13 +84,14 @@ int decode_data_wUL( unsigned int * data , unsigned int * ce , int * crc , int *
 
   // Check a new event is available in the memory
   if( ( magic & 0xffff0000 ) != 0x7f7f0000 ){
-    printf("Invalid magic number %.8x pos %d : ", magic, *ce );
-    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+    printf("[ERROR] Invalid magic number(7f7f)  %.8x pos %d\n", magic, *ce );
+    printf("[DEBUG] %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
 	   data[ ( *ce ) % DMASIZE ], data[ ( *ce + 1 ) % DMASIZE ], data[ ( *ce + 2 ) % DMASIZE ], 
 	   data[ ( *ce + 3 ) % DMASIZE ], data[ ( *ce + 4 ) % DMASIZE ], data[ ( *ce + 5 ) % DMASIZE ],
 	   data[ ( *ce + 6 ) % DMASIZE ], data[ ( *ce + 7 ) % DMASIZE ] );
+    //    if( *prev_exp_run != -1)  print_data(data);
+    print_data(data);
 
-    //    print_data(data);
     // search for next good event
     int j = 0 ; 
     for ( j = *ce ; j < *ce + DMASIZE ; ++j ) { 
@@ -101,9 +102,9 @@ int decode_data_wUL( unsigned int * data , unsigned int * ce , int * crc , int *
 	exp_run = data[ ( j + 1 ) % DMASIZE ];
 	evenum = data[ ( j + 2 ) % DMASIZE ];
 	cur_pos = ( j - 1 ) % DMASIZE;
-	printf("New ! eve %.8x pos %d size %d : ", evenum, j - 1, size);
+	printf("[INFO] New ! eve %.8x pos %d size %d\n", evenum, j - 1, size);
 	new = 1;
-	printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	printf("[DEBUG] %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
 	       data[ ( j - 1 ) % DMASIZE ],data[ ( j  ) % DMASIZE ],
 	       data[ ( j + 1 ) % DMASIZE ], data[ ( j + 2 ) % DMASIZE ], 
 	       data[ ( j + 3 ) % DMASIZE ], data[ ( j + 4 ) % DMASIZE ], data[ ( j + 5 ) % DMASIZE ],
@@ -115,7 +116,7 @@ int decode_data_wUL( unsigned int * data , unsigned int * ce , int * crc , int *
   }
 
 
-  printf("[INFO] Good! run %.8x prevrun %.8x eve %.8x pos %.8x size %.8x\n", exp_run, *prev_exp_run, evenum, *ce, size);
+  printf("[INFO]  Good! run %.8x prevrun %.8x eve %.8x pos %.8x size %.8x\n", exp_run, *prev_exp_run, evenum, *ce, size);
 
   
   if( size % 8 != 0 ){
@@ -128,19 +129,19 @@ int decode_data_wUL( unsigned int * data , unsigned int * ce , int * crc , int *
     printf("[WARNING] Missing events run cur %.8x pre %.8x eve cur %.8x pre %.8x\n", exp_run, *prev_exp_run, evenum, *evn );
   }
 
-  if( exp_run < *prev_exp_run && *prev_exp_run < 0x1000000 ){
+  if( (int)exp_run < (int)(*prev_exp_run) && *prev_exp_run < 0x1000000 ){
     printf("[NOTICE] Reached prev. run data : run cur %.8x pre %.8x eve cur %.8x pre %.8x\n", exp_run, *prev_exp_run, evenum, *evn );
     return -1;
   }else if( exp_run > 0x1000000 ){
     printf("[ERROR] Too large run num! run %.8x prevrun %.8x eve %.8x pos %.8x size %.8x\n", exp_run, *prev_exp_run, evenum, *ce, size);
     if( new == 1 ){
-	printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	printf("[DEBUG] %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
 	       data[ ( cur_pos  ) % DMASIZE ],
 	       data[ ( cur_pos + 1 ) % DMASIZE ], data[ ( cur_pos + 2 ) % DMASIZE ], 
 	       data[ ( cur_pos + 3 ) % DMASIZE ], data[ ( cur_pos + 4 ) % DMASIZE ], data[ ( cur_pos + 5 ) % DMASIZE ],
 	       data[ ( cur_pos + 6 ) % DMASIZE ], data[ ( cur_pos + 7 ) % DMASIZE ], data[ ( cur_pos + 8 ) % DMASIZE ]);
     }else{
-      printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+      printf("[DEBUG] %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
 	   data[ ( *ce ) % DMASIZE ], data[ ( *ce + 1 ) % DMASIZE ], data[ ( *ce + 2 ) % DMASIZE ], 
 	   data[ ( *ce + 3 ) % DMASIZE ], data[ ( *ce + 4 ) % DMASIZE ], data[ ( *ce + 5 ) % DMASIZE ],
 	   data[ ( *ce + 6 ) % DMASIZE ], data[ ( *ce + 7 ) % DMASIZE ] );
@@ -270,11 +271,11 @@ int main(int argc ,char** argv) {
   ecs_write( 0 , 2 ,  0x000501A0 , 0x1 ) ;
   pcie40_b2dmabufferreset( 0 ) ; 
   // Start trigger
-  int run  = 0 ; 
+  int run  = -1 ; 
   FILE* fp; 
   char * ptr ;
   char * tmp ;
-  fp = popen( "ssh yamadas@ttd7 \"trigft -23 poisson 1000 -1\"" , "r" ) ;
+  fp = popen( "ssh yamadas@ttd7 \"trigft -23 poisson 5 -1\"" , "r" ) ;
   char buf[1000] ;
   char exp[] = "exp" ; 
   sleep( 2 ) ;