prefix code to shared mem added. Sergey

diff --git a/hadaq/args.c b/hadaq/args.c
index 7f171de1873cfeb42cf6ebf4986f0e7d860c308c..f031a3dd4f7017f76f889f9982d78650f2965d36 100644 (file)
--- a/hadaq/args.c
+++ b/hadaq/args.c
@@ -467,3 +467,30 @@ void Args_dump(TheArgs *my)
        }
        syslog(LOG_DEBUG, "EB numder: %d", my->ebnum);
 }
+
+int Args_prefixCode(TheArgs *my)
+{
+       char alphabet[] = "abcdefghijklmnopqrstuvwxyz";
+       int code = 0;
+       int i, j;
+
+       /* Loop over prefix */
+       for (j = 0; j < 2; j++) {
+
+               /* Loop over letters of Alphabet */
+               for (i = 0; i < 26; i++) {
+
+                       if (alphabet[i] == my->expId[j]) {
+
+                               /*
+                                *  Build prefix code:
+                                *  add 1 to the code to get rid of zero's 
+                                *  in case of 'aa' prefix.
+                                */
+                               code = code * 100 + i + 1;
+                       }
+               }
+       }
+
+       return code;
+}

diff --git a/hadaq/args.h b/hadaq/args.h
index 5725b630ae2ee170eb912cc1c80d46193887ca0f..d2afb0e52d170707c04e089acc0c7362830a9af8 100644 (file)
--- a/hadaq/args.h
+++ b/hadaq/args.h
@@ -83,5 +83,6 @@ void Args_default(TheArgs *my);
 int Args_check(TheArgs *my);
 int Args_fromParam(TheArgs *my, int argc, char *argv[]);
 void Args_dump(TheArgs *my);
+int Args_prefixCode(TheArgs *my);
 
 #endif

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 438375d2f793aaf567c729efdddab0c233033141..6efb24783df376bb18c5536fe9d90193b3b13d1f 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.142 2010-10-28 17:27:25 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.143 2010-11-24 15:02:11 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -1046,6 +1046,13 @@ int main(int argc, char *argv[])
        theStats->nrOfMsgs = Worker_addStatistic(worker, "nrOfMsgs");
        (*theStats->nrOfMsgs) = theArgs->nrOfMsgs;
 
+       /*
+        *  We have to code prefix string to a number since
+        *  we cannot pass a string via shared memory.
+        */
+       theStats->prefixCode = Worker_addStatistic(worker, "prefix");
+       (*theStats->prefixCode) = Args_prefixCode(theArgs);
+
        theStats->PID = Worker_addStatistic(worker, "PID");
        theStats->coreNr = Worker_addStatistic(worker, "coreNr");
 

diff --git a/hadaq/stats.h b/hadaq/stats.h
index cdc309d0b7be4ce21979696a6b8e56666fde6e45..f03f8bf2105fa545f07812121ba9a4c940df928b 100644 (file)
--- a/hadaq/stats.h
+++ b/hadaq/stats.h
@@ -38,6 +38,7 @@ typedef struct TheStatsS {
        unsigned long *diskNrEB;
        unsigned long *PID;
        unsigned long *coreNr;
+       unsigned long *prefixCode;
 } TheStats;