From: Maps <maps@ikf>
Date: Wed, 26 Nov 2014 12:50:39 +0000 (+0100)
Subject: pushing the current status (before unpacker extensions)
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=db886d0a37437e0fd75aa2bd08a6213475118a69;p=mvdsensorcontrol.git

pushing the current status (before unpacker extensions)
---

diff --git a/shm b/shm
new file mode 120000
index 0000000..0d99fd7
--- /dev/null
+++ b/shm
@@ -0,0 +1 @@
+/dev/shm
\ No newline at end of file
diff --git a/tools/init_system.pl b/tools/init_system.pl
index e492cb0..43e64a6 100755
--- a/tools/init_system.pl
+++ b/tools/init_system.pl
@@ -53,6 +53,8 @@ print("GBE:\t".join(", ", map {sprintf("%04x",$_)} @gbe)."\n");
  
 run("trbcmd reset");
 
+sleep 1;
+
 #Set addresses
 run(DAQTOOLSPATH."/tools/merge_serial_address.pl ".DAQTOOLSPATH."/base/serials_trb3.db ".CONFIGPATH."/network/addresses_trb3.db");
 #Set GbE Configuration (common for all boards)
@@ -67,9 +69,12 @@ if($system eq 'Vacuum') {
   trb_write($ccu,0x00c3,0x00ff);   #only slowcontrol for unused FPGA
   }
 if($system eq 'ELab') {
-  trb_write($ccu,0x00c0,0x00ec);   
-  trb_write($ccu,0x00c1,0x00ec);
-  trb_write($ccu,0x00c3,0x00fc); # only 0x00, 0x02, 0x03 active 
+   trb_write($ccu,0x00c0,0x00ec);   
+   trb_write($ccu,0x00c1,0x00ec);
+   trb_write($ccu,0x00c3,0x00fc); # only 0x00, 0x02, 0x03 active 
+#  trb_write($ccu,0x00c0,0x00f8);   
+#  trb_write($ccu,0x00c1,0x00f8);
+#  trb_write($ccu,0x00c3,0x00f8); # only 0x03 active
   }
 
 #Send arbiter start signal
diff --git a/tools/preview/exec_evtbuild_t.pl b/tools/preview/exec_evtbuild_t.pl
index 533822d..35eb5ed 100755
--- a/tools/preview/exec_evtbuild_t.pl
+++ b/tools/preview/exec_evtbuild_t.pl
@@ -83,6 +83,7 @@ $thr2->join();
 	
 sub execute {
 	my $s = shift;
+        print "$s\n";
 	system($s);
 }
 
diff --git a/tools/run.pl b/tools/run.pl
index d153fe3..8180c24 100755
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -67,12 +67,18 @@ print start_html(
 # $ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
 # $ENV{'DAQOPSERVER'}="localhost:7";
 
-unless(-e $dumpPath or mkdir $dumpPath) {
-  die "Unable to create $dumpPath\n";
+
+
+unless(-e $dumpPath) {
+  print "creating data dump directory: $dumpPath\n";
+  system("mkdir -p $dumpPath");
+  die "Unable to create $dumpPath\n" unless(-e $dumpPath);
 }
 
-unless(-e $picPath or mkdir $picPath) {
-  die "Unable to create $picPath\n";
+unless(-e $picPath) {
+  print "creating plot directory: $picPath\n";
+  system("mkdir -p $picPath");
+  die "Unable to create $picPath\n" unless(-e $picPath);
 }
 
 # system("./init_setup.pl ".SETUPFILE);
@@ -85,6 +91,7 @@ print qx"./init_setup.pl $setupFile";
 unless($q->param('startupOnly') eq 'true'){
   print qx|date|;
   print qx"rm $dumpPath/te1*.hld 2>&1";
+  print "./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath -s $systemName -d $ports 2>&1";
   print qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath -s $systemName -d $ports 2>&1";
   print qx|date|;
   print qx"rm $dumpPath/temp.hld 2>&1";
diff --git a/tools/unpacker/versions.txt b/tools/unpacker/versions.txt
index f304000..f6ae0c0 100644
--- a/tools/unpacker/versions.txt
+++ b/tools/unpacker/versions.txt
@@ -1,13 +1,25 @@
 
 Format Version
 
-           1                                 2
-
-1       HEADER                         HEADER FFFFFFFF
-2         ID                 F00 + VERSION + 000 + Testmode OFF/ON
-3       STATUS                              ID
-4      ERRCODE                            STATUS
-5       DEBUG                            RESERVED
-6      TIMESTAMP                         RESERVED
-7      TIMESTAMP                         EXTERNAL
-8                                       FRAME_NUM
+           1                                 2                                              NEW (Jan)
+ 
+1       HEADER                         HEADER FFFFFFFF                     HEADER VERSION / DATA VERSION / Num Data (='01')
+2         ID                 F00 + VERSION + 000 + Testmode OFF/ON                     TIMER / FOUND EXTERNAL
+3       STATUS                              ID                                           DLEN+3 / CHIP_ID       
+4      ERRCODE                            STATUS                                             STATUS
+5       DEBUG                            RESERVED                                            DEBUG
+6      TIMESTAMP                         RESERVED                                         TIMESTAMP
+7      TIMESTAMP                         EXTERNAL                                    >>> START RAW DATA
+8    >>>START RAW DATA                   FRAME_NUM
+9                                    >>> START RAW DATA
+
+
+
+
+
+
+Planned Boris:
+ 
+        HEADER VERSION ='02' / DATA VERSION ='01' / NUM DATA ='01'
+                        TIMER / FOUND EXTRENAL
+                              xxxxxxxxxxx
\ No newline at end of file