Changeset 274 for drsdaq

Timestamp:

07/30/10 12:35:09 (14 years ago)

Author:

ogrimm

Message:

drsdaq publishes some more run-related services

Location:

drsdaq

Files:

• DAQReadout.cc (modified) (9 diffs)
• DAQReadout.h (modified) (2 diffs)
• History.txt (modified) (1 diff)

drsdaq/DAQReadout.cc

@@ -78 +78 @@
   LastBoard                     = -1;
   MinDelay                      = 1;
+  RunNumber                     = -1;
 
   // Get configuration data (static needed for c_str() pointers to remain valid after constructor finished)
@@ -142 +143 @@
   // Create DIM event data service
   EventService = new DimService (SERVER_NAME"/EventData", (char *) "C", DIMEventData, 0);
+  RunNumService = new DimService (SERVER_NAME"/RunNumber", RunNumber);
                                                    
   // Install DIM command (after all initialized)
@@ -155 +157 @@
   delete Command;
 
+  delete RunNumService;
   delete EventService;  delete[] DIMEventData;
   delete RHeader;               delete EHeader;
@@ -299 +302 @@
   }
   else RunNumber = -1;
+  RunNumService->updateService();
 
   // Create DAQ thread
@@ -1197 +1201 @@
   off_t FileSize;
   int DIMSize;
+  float RunSizeMB=0, FileSizeMB=0;
 
   // Initialize run
@@ -1202 +1207 @@
   FileNumber = 0;
   DimClient::sendCommandNB("Feedback/Command", "clear");
+
+  DimService RunSizeService(SERVER_NAME"/RunSizeMB", RunSizeMB);
+  DimService FileSizeService(SERVER_NAME"/FileSizeMB", FileSizeMB);
+  DimService EventNumService(SERVER_NAME"/EventNumber", NumEvents);
+  DimService FilenameService(SERVER_NAME"/FileName", FileName);
     
   gettimeofday(&StartTime, NULL);
@@ -1218 +1228 @@
     EventsInFile = 0;
     FileSize = 0;
+        FilenameService.updateService();
 
     WriteError |= !WriteRunHeader();
@@ -1277 +1288 @@
           }
 
-      // Call routine to update DIM service (update rate is limited)
+      // Update DIM services (update rate is limited)
           if (time(NULL) - LastDIMUpdate < MinDelay) continue;
           LastDIMUpdate = time(NULL);
+          
+          RunSizeMB = (RunSize+FileSize)/1024.0/1024.0;
+          RunSizeService.updateService();
+          FileSizeMB = FileSize/1024.0/1024.0;
+          FileSizeService.updateService();
+          EventNumService.updateService();
           
           // Copy new event header
@@ -1338 +1355 @@
   }
   
+  RunNumber = -1;
+  RunNumService->updateService();
+
   daq_state = stopped;
 }

drsdaq/DAQReadout.h

@@ -33 +33 @@
         pid_t MainThread;
         DimService *EventService;
+        DimService *RunNumService;
         int MinDelay;
     unsigned int CmdNumber;
@@ -64 +65 @@
     runtype_enum daq_runtype;
     bool Stop;                  // Set to true to stop run
-    unsigned int NumEvents;             // Number of event taken            
-    unsigned int NumEventsRequested;    // Number of events requested
+    int NumEvents;              // Number of event taken            
+    int NumEventsRequested;     // Number of events requested
     int RunNumber; 
     unsigned int FileNumber; 

drsdaq/History.txt

@@ -73 +73 @@
                         invoked through a DIM command. Last revision with feedback integrated into
                         drsdaq is 264.
+30/7/2010       Published some run-related information as DIM service.