Changeset 11385

Timestamp:

07/13/11 20:02:16 (13 years ago)

Author:

ogrimm

Message:

Board time published as DIM service, files written with permissions for OTHER

Location:

fact/FADctrl

Files:

• FAD.cc (modified) (1 diff)
• FADBoard.cc (modified) (2 diffs)
• FADBoard.h (modified) (1 diff)
• History.txt (modified) (1 diff)

fact/FADctrl/FAD.cc

@@ -536 +536 @@
   snprintf(Filename, sizeof(Filename),"%s/%d%02d%02dT%02d%02d%02d.raw", Parameter[2].c_str(), T->tm_year+1900, T->tm_mon+1, T->tm_mday, T->tm_hour, T->tm_min, T->tm_sec);
 
-  Datafile = open(Filename,O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
+  Datafile = open(Filename,O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
   if(Datafile == -1) {
     PrintMessage("Error: Could not open file \"%s\" (%s)\n", Filename, strerror(errno));

fact/FADctrl/FADBoard.cc

@@ -57 +57 @@
   DIM_Rate = new DimService((ID.str()+"RateHz").c_str(), Status.Rate);
   DIM_Frequency = new DimService((ID.str()+"Frequency").c_str(), Status.Frequency);
+  DIM_BoardTime = new DimService((ID.str()+"BoardTime").c_str(), (char *) "I", &Status.BoardTime, sizeof(Status.BoardTime));
   DIM_Lock = new DimService((ID.str()+"Lock").c_str(), (char *) "S", &Status.Lock, sizeof(Status.Lock));
   DIM_TriggerNum = new DimService((ID.str()+"TriggerNum").c_str(), (char *) "I", &Status.TriggerNum, sizeof(Status.TriggerNum));
@@ -548 +549 @@
                 if (PrevStatus.Frequency != Status.Frequency) DIM_Frequency->updateService();
                 if (PrevStatus.TriggerNum != Status.TriggerNum) DIM_TriggerNum->updateService();
+                if (PrevStatus.BoardTime != Status.BoardTime) DIM_BoardTime->updateService();
                 if (PrevStatus.Rate != Status.Rate) DIM_Rate->updateService();
 

fact/FADctrl/FADBoard.h

@@ -30 +30 @@
         pthread_mutex_t Mutex;
         DimService *DIM_Name, *DIM_Status, *DIM_ID, *DIM_Frequency, *DIM_Lock, *DIM_TriggerNum;
-        DimService *DIM_Rate, *DIM_Temp, *DIM_ROI, *DIM_DAC, *DIM_ACalData;
+        DimService *DIM_Rate, *DIM_Temp, *DIM_ROI, *DIM_DAC, *DIM_ACalData, *DIM_BoardTime;
 
         void ReadLoop();

fact/FADctrl/History.txt

@@ -35 +35 @@
 24/6/2011       PLL lock status published as DIM service
 7/7/2011        Fixed error in setting the active boards in EventThread()
+13/7/2911   FAD board time published as DIM service