Index: trunk/MagicSoft/Mars/mreport/MReportCamera.cc =================================================================== --- trunk/MagicSoft/Mars/mreport/MReportCamera.cc (revision 2553) +++ trunk/MagicSoft/Mars/mreport/MReportCamera.cc (revision 2555) @@ -35,13 +35,12 @@ #include "MParList.h" -#include "../mcamera/MCameraHV.h" +#include "MCameraCalibration.h" +#include "MCameraCooling.h" +#include "MCameraHV.h" +#include "MCameraLV.h" +#include "MCameraAUX.h" +#include "MCameraLids.h" ClassImp(MReportCamera); - -ClassImp(MCameraCooling); -ClassImp(MCameraLids); -ClassImp(MCameraHV); -ClassImp(MCameraLV); -ClassImp(MCameraCalibration); using namespace std; @@ -60,4 +59,8 @@ fLids = (MCameraLids*)plist.FindCreateObj("MCameraLids"); if (!fLids) + return kFALSE; + + fAUX = (MCameraAUX*)plist.FindCreateObj("MCameraAUX"); + if (!fAUX) return kFALSE; @@ -124,29 +127,69 @@ Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %n", + + Int_t wall, opt, center, water; + Short_t hwall, hcenter, hip, lop, pump, ref, valv, res, fans; + const Int_t n=sscanf(str.Data(), "%d %d %d %d %hu %hu %hu %hu %hu %hu %hu %hu %hu %n", + &wall, &opt, ¢er, &water, &hwall, &hcenter, + &hip, &lop, &pump, &ref, &valv, &res, &fans, &len); + if (n!=13) + { + *fLog << err << "ERROR - Reading information of 'COOL' section." << endl; + return kFALSE; + } + + fCooling->fTempWall = 0.1*wall; + fCooling->fTempOptLink = 0.1*opt; + fCooling->fTempCenter = 0.1*center; + fCooling->fTempWater = 0.1*water; + fCooling->fHumWall = (Byte_t)hwall; + fCooling->fHumCenter = (Byte_t)hcenter; + fCooling->fStatusPressureHi = (Bool_t)hip; + fCooling->fStatusPressureLo = (Bool_t)lop; + fCooling->fStatusPump = (Bool_t)pump; + fCooling->fStatusRefrigrerator = (Bool_t)ref; + fCooling->fStatusValve = (Bool_t)valv; + fCooling->fStatusResistor = (Bool_t)res; + fCooling->fStatusFans = (Bool_t)fans; + + str.Remove(0, len); + str=str.Strip(TString::kLeading); + return kTRUE; +} + +Bool_t MReportCamera::InterpreteLID(TString &str) +{ + if (!CheckTag(str, "LID ")) + return kFALSE; + + Int_t len; + Short_t limao, limac, limbo, limbc; + Short_t slimao, slimac, slimbo, slimbc; + Short_t slida, slidb, mlida, mlidb; + const Int_t n=sscanf(str.Data(), "%hu %hu %hu %hu %hu %hu %hu %hu %hu %hu %hu %hu %n", + &limao, &limac, &limbo, &limbc, + &slimao, &slimac, &slimbo, &slimbc, + &slida, &slidb, &mlida, &mlidb, &len); - if (n!=0) - { - *fLog << err << "ERROR - Reading information of 'COOL' section." << endl; - return kFALSE; - } - str.Remove(0, len); - str=str.Strip(TString::kLeading); - return kTRUE; -} - -Bool_t MReportCamera::InterpreteLID(TString &str) -{ - if (!CheckTag(str, "LID ")) - return kFALSE; - - Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %n", - &len); - if (n!=0) + if (n!=12) { *fLog << err << "ERROR - Reading information of 'LID' section." << endl; return kFALSE; } + + fLids->fLidA.fLimitOpen = (Bool_t)limao; + fLids->fLidA.fLimitClose = (Bool_t)limac; + fLids->fLidA.fSafetyLimitOpen = (Bool_t)slimao; + fLids->fLidA.fSafetyLimitClose= (Bool_t)slimac; + fLids->fLidA.fStatusLid = (Byte_t)slida; + fLids->fLidA.fStatusMotor = (Byte_t)mlida; + + fLids->fLidB.fLimitOpen = (Bool_t)limbo; + fLids->fLidB.fLimitClose = (Bool_t)limbc; + fLids->fLidB.fSafetyLimitOpen = (Bool_t)slimbo; + fLids->fLidB.fSafetyLimitClose= (Bool_t)slimbc; + fLids->fLidB.fStatusLid = (Byte_t)slidb; + fLids->fLidB.fStatusMotor = (Byte_t)mlidb; + str.Remove(0, len); str=str.Strip(TString::kLeading); @@ -160,11 +203,16 @@ Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %*d %*d %n", - &len); - if (n!=0) + Short_t c1, c2; + const Int_t n=sscanf(str.Data(), "%hd %hd %hd %hd %n", + &fHV->fVoltageA, &fHV->fVoltageB, &c1, &c2, &len); + if (n!=4) { *fLog << err << "ERROR - Reading information of 'HVPS' section." << endl; return kFALSE; } + + fHV->fCurrentA = (Byte_t)c1; + fHV->fCurrentB = (Byte_t)c2; + str.Remove(0, len); str=str.Strip(TString::kLeading); @@ -178,11 +226,39 @@ Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %n", - &len); - if (n!=0) + Short_t vap5, vap12, van12, vbp5, vbp12, vbn12; + Short_t valp12, vblp12, cap5, cap12, can12, cbp5, cbp12; + Short_t cbn12, calp12, cblp12, lvps, temp, hum; + const Int_t n=sscanf(str.Data(), "%hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %n", + &vap5, &vap12, &van12, &vbp5, &vbp12, &vbn12, + &valp12, &vblp12, &cap5, &cap12, &can12, &cbp5, &cbp12, + &cbn12, &calp12, &cblp12, &lvps, &temp, &hum, &len); + if (n!=19) { *fLog << err << "ERROR - Reading information of 'LV' section." << endl; return kFALSE; } + + fLV->fRequestPowerSupply = (Bool_t)lvps; + fLV->fTemp = 0.1*temp; + fLV->fHumidity = (Byte_t)hum; + + fLV->fPowerSupplyA.fVoltagePos5V = 0.01*vap5; + fLV->fPowerSupplyA.fVoltagePos12V = 0.01*vap12; + fLV->fPowerSupplyA.fVoltageNeg12V = 0.01*van12; + fLV->fPowerSupplyA.fVoltageOptLinkPos12V = 0.01*valp12; + fLV->fPowerSupplyA.fCurrentPos5V = 0.001*cap5; + fLV->fPowerSupplyA.fCurrentPos12V = 0.001*cap12; + fLV->fPowerSupplyA.fCurrentNeg12V = 0.001*can12; + fLV->fPowerSupplyA.fCurrentOptLinkPos12V = 0.001*calp12; + + fLV->fPowerSupplyB.fVoltagePos5V = 0.01*vbp5; + fLV->fPowerSupplyB.fVoltagePos12V = 0.01*vbp12; + fLV->fPowerSupplyB.fVoltageNeg12V = 0.01*vbn12; + fLV->fPowerSupplyB.fVoltageOptLinkPos12V = 0.01*vblp12; + fLV->fPowerSupplyB.fCurrentPos5V = 0.001*cbp5; + fLV->fPowerSupplyB.fCurrentPos12V = 0.001*cbp12; + fLV->fPowerSupplyB.fCurrentNeg12V = 0.001*cbn12; + fLV->fPowerSupplyB.fCurrentOptLinkPos12V = 0.001*cblp12; + str.Remove(0, len); str=str.Strip(TString::kLeading); @@ -196,10 +272,15 @@ Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %n", &len); - if (n!=0) + Short_t led, fan; + const Int_t n=sscanf(str.Data(), "%hd %hd %n", &led, &fan, &len); + if (n!=2) { *fLog << err << "ERROR - Reading information of 'AUX' section." << endl; return kFALSE; } + + fAUX->fRequestCaosLEDs=(Bool_t)led; + fAUX->fRequestFansFADC=(Bool_t)fan; + str.Remove(0, len); str=str.Strip(TString::kLeading); @@ -213,6 +294,8 @@ Int_t len; - const Int_t n=sscanf(str.Data(), "%*d %*d %*d %*d %n", &len); - if (n!=0) + Short_t hv, lv, cont, pin; + + const Int_t n=sscanf(str.Data(), "%hd %hd %hd %hd %n", &hv, &lv, &cont, &pin, &len); + if (n!=4) { *fLog << err << "ERROR - Reading information of 'CAL' section." << endl; @@ -220,6 +303,46 @@ } + fCalibration->fRequestHiVoltage = (Bool_t)hv; + fCalibration->fRequestLoVoltage = (Bool_t)lv; + fCalibration->fRequestContLight = (Bool_t)cont; + fCalibration->fRequestPinDiode = (Bool_t)pin; + str.Remove(0, len); str=str.Strip(TString::kBoth); + return kTRUE; +} + +Bool_t MReportCamera::InterpreteCamera(TString &str) +{ + // + // I have tried to do it with pure pointer arithmentics, but most of the time is spent + // to do the sscanf. So we gain less than 5% not using TString like it is done here. + Int_t len; + Short_t cal, stat, hvps, lid, lv, cool, hv, dc, led, fan, can, io, clv; + Int_t n=sscanf(str.Data(), " %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %hd %n", + &cal, &stat, &hvps, &lid, &lv, &cool, &hv, + &dc, &led, &fan, &can, &io, &clv, &len); + if (n!=13) + { + *fLog << err << "ERROR - Cannot interprete status' of subsystems." << endl; + return kFALSE; + } + str.Remove(0, len); + str=str.Strip(TString::kLeading); + + fHV->fStatus = (Byte_t)hvps; + fLids->fStatus = (Byte_t)lid; + fLV->fStatus = (Byte_t)lv; + fCooling->fStatus = (Byte_t)cool; + fHV->fStatusRamping = (Byte_t)hv; + fAUX->fStatusCaosLEDs = (Bool_t)led; + fAUX->fStatusFansFADC = (Bool_t)fan; + fCalibration->fStatus = (Bool_t)cal; + fCalibration->fStatusCANbus = (Bool_t)can; + fCalibration->fStatusIO = (Bool_t)io; + fCalibration->fStatusLoVoltage = (Bool_t)clv; + fStatus = (Byte_t)stat; + fStatusDC = (Byte_t)dc; + return kTRUE; } @@ -229,18 +352,6 @@ Bool_t MReportCamera::InterpreteBody(TString &str) { - // - // I have tried to do it with pure pointer arithmentics, but most of the time is spent - // to do the sscanf. So we gain less than 5% not using TString like it is done here. - Int_t len; - Int_t n=sscanf(str.Data(), " %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %n", - &len); - - if (n!=0) - { - *fLog << err << "ERROR - Cannot interprete status' of subsystems." << endl; - return kFALSE; - } - str.Remove(0, len); - str=str.Strip(TString::kLeading); + if (!InterpreteCamera(str)) + return kFALSE; if (!InterpreteDC(str)) Index: trunk/MagicSoft/Mars/mreport/Makefile =================================================================== --- trunk/MagicSoft/Mars/mreport/Makefile (revision 2553) +++ trunk/MagicSoft/Mars/mreport/Makefile (revision 2555) @@ -22,5 +22,5 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../mbase -I../mtools +INCLUDES = -I. -I../mbase -I../mtools -I../mcamera #------------------------------------------------------------------------------