Rest daq

inc/TRestRawDAQMetadata.h

@@ -28,6 +28,24 @@
 #include "TRestMetadata.h"
 #include "TString.h"
 
+namespace daq_metadata_types {
+
+  enum class acqTypes : int {
+    BACKGROUND,
+    CALIBRATION,
+    PEDESTAL
+  };
+
+  enum class electronicsTypes : int {
+    DUMMY,
+    DCC
+  };
+
+  const std::map<std::string, acqTypes> acqTypes_map = {{"background",acqTypes::BACKGROUND}, {"calibration",acqTypes::CALIBRATION},{"pedestal",acqTypes::PEDESTAL}};
+  const std::map<std::string, electronicsTypes> electronicsTypes_map = {{"DUMMY",electronicsTypes::DUMMY}, {"DCC",electronicsTypes::DCC}};
+
+}
+
 //! A metadata class to store DAQ information.
 class TRestRawDAQMetadata : public TRestMetadata {
    private:
@@ -36,36 +54,44 @@ class TRestRawDAQMetadata : public TRestMetadata {
     virtual void Initialize();
 
    protected:
-    TString fOutBinFileName;
-    TString fElectronicsType;
-    std::vector<TString> fPedBuffer;  // Pedestal script
-    std::vector<TString> fRunBuffer;  // Run script
-    TString fNamePedScript;           // Name of the run script e.g. /home/user/scripts/run
-    TString fNameRunScript;           // Name of the pedestal script e.g.
-                                      // /home/user/scripts/ped
-    UInt_t fGain;                     // Value of the gain in the script you have to convert it to fC
-    UInt_t fShappingTime;             // Value of the shapping time in the script you have to
-                                      // convert it to nS
+    TString fElectronicsType;            // DCC, FEMINOS, ARC, ...
+
+    UInt_t fFECMask;                     // FEC Mask
+    UInt_t fGain;                        // Gain in the AFTER/AGET chip
+    UInt_t fShappingTime;                // Shapping time in the AFTER/AGET chip
+    UInt_t fClockDiv;                    // Clock division
+    Int_t fBaseIp[4] = {192,168,10,13};  //Base IP of the card
+    TString fTriggerType;                // external or internal
+    TString fAcquisitionType;            // pedestal, calibration or background
+    UInt_t fCompressMode =0;             // 0 uncompressed, 1 compress
+    Int_t fNEvents=0;                   // 0 --> Infinite
 
    public:
-    void PrintMetadata();
-    void PrintRunScript();
-    void PrintPedScript();
+    virtual void PrintMetadata();
+    void ReadBaseIp();
 
     // Construtor
     TRestRawDAQMetadata();
-    TRestRawDAQMetadata(char* cfgFileName);
+    TRestRawDAQMetadata(const char* cfgFileName);
     // Destructor
     virtual ~TRestRawDAQMetadata();
 
-    void SetScriptsBuffer();
-    void SetParFromPedBuffer();  // Set gain and shapping time from a given buffer
-    void SetOutBinFileName(TString fName) { fOutBinFileName = fName; }
-
+    UInt_t GetFECMask() { return fFECMask; }
     UInt_t GetGain() { return fGain; }
     UInt_t GetShappingTime() { return fShappingTime; }
+    UInt_t GetClockDiv() { return fClockDiv; }
+    TString GetTriggerType() { return fTriggerType; }
+    TString GetAcquisitionType() { return fAcquisitionType; }
+    TString GetElectronicsType() { return fElectronicsType; }
+    Int_t GetNEvents() { return fNEvents; }
+    Int_t* GetBaseIp() { return fBaseIp; }
+    UInt_t GetCompressMode(){return fCompressMode;}       // 0 uncompressed, 1 compress    
     UInt_t GetValFromString(TString var, TString line);
+    TString GetDecodingFile(){return GetParameter("decodingFile");}
+
+    void SetAcquisitionType (const std::string &typ){fAcquisitionType = typ;}
+    void SetNEvents(const Int_t & nEv){fNEvents=nEv;}
 
-    ClassDef(TRestRawDAQMetadata, 1);  // REST run class
+    ClassDef(TRestRawDAQMetadata, 2);  // REST run class
 };
 #endif

inc/TRestRawSignal.h

@@ -216,6 +216,7 @@ class TRestRawSignal : public TObject {
 
     TRestRawSignal();
     TRestRawSignal(Int_t nBins);
+    TRestRawSignal(Int_t sID, std::vector<Short_t> &sData);
     ~TRestRawSignal();
 
     ClassDef(TRestRawSignal, 1);

src/TRestRawDAQMetadata.cxx

@@ -64,13 +64,10 @@ ClassImp(TRestRawDAQMetadata);
 //______________________________________________________________________________
 TRestRawDAQMetadata::TRestRawDAQMetadata() { Initialize(); }
 
-TRestRawDAQMetadata::TRestRawDAQMetadata(char* cfgFileName) : TRestMetadata(cfgFileName) {
+TRestRawDAQMetadata::TRestRawDAQMetadata(const char* cfgFileName) : TRestMetadata(cfgFileName) {
     Initialize();
 
     LoadConfigFromFile(fConfigFileName);
-
-    SetScriptsBuffer();
-    SetParFromPedBuffer();
 }
 
 void TRestRawDAQMetadata::Initialize() {
@@ -79,115 +76,51 @@ void TRestRawDAQMetadata::Initialize() {
 }
 
 //______________________________________________________________________________
-TRestRawDAQMetadata::~TRestRawDAQMetadata() { cout << "Deleting TRestRawDAQMetadata" << endl; }
+TRestRawDAQMetadata::~TRestRawDAQMetadata() { 
+
+ }
 
 //______________________________________________________________________________
 void TRestRawDAQMetadata::InitFromConfigFile() {
     // string daqString;
 
-    fNamePedScript = GetParameter("pedScript");
-    if (fNamePedScript == "") {
-        cout << "Pedestal script " << endl;
-    }
-
-    fNameRunScript = GetParameter("runScript");
-    if (fNameRunScript == "") {
-        cout << "Run script " << endl;
-    }
-
     fElectronicsType = GetParameter("electronics");
-    if (fElectronicsType == "") {
-        cout << "electronic type not found " << endl;
-    }
-}
-
-void TRestRawDAQMetadata::PrintMetadata() {
-    cout << endl;
-    cout << "====================================" << endl;
-    cout << "DAQ : " << GetTitle() << endl;
-    cout << "Pedestal script : " << fNamePedScript.Data() << endl;
-    cout << "Run script : " << fNameRunScript.Data() << endl;
-    cout << "Electronics type : " << fElectronicsType.Data() << endl;
-    cout << "Gain : " << GetGain() << endl;
-    cout << "Shapping time : " << GetShappingTime() << endl;
-    cout << "====================================" << endl;
-
-    cout << endl;
-}
-
-void TRestRawDAQMetadata::SetScriptsBuffer() {
-    TString folder = REST_PATH;
-    folder.Append("data/acquisition/");
-
-    TString fName;
-
-    fName = folder + fNamePedScript;
-
-    ifstream file(fName);
-    if (!file) {
-        cout << __PRETTY_FUNCTION__ << " ERROR:FILE " << fName << " not found " << endl;
-        return;
-    }
+    fFECMask = StringToInteger( GetParameter("fecMask") );
+    fGain = StringToInteger( GetParameter("chipGain") );
+    fShappingTime = StringToInteger( GetParameter("chipShappingTime") );
+    fClockDiv = StringToInteger( GetParameter("clockDiv") );
+    fTriggerType = GetParameter("triggerType");
+    fAcquisitionType = GetParameter("acquisitionType");
+    fCompressMode = StringToInteger(GetParameter("compressMode"));
+    fNEvents = StringToInteger(GetParameter("Nevents"));
+    ReadBaseIp( );
 
-    string line;
-    while (getline(file, line)) {
-        fPedBuffer.push_back(line);
-    }
-
-    file.close();
-
-    fName = folder + fNameRunScript;
-
-    ifstream file2(fName);
-    if (!file2) {
-        cout << __PRETTY_FUNCTION__ << " ERROR:FILE " << fName << " not found " << endl;
-        return;
-    }
-
-    while (getline(file2, line)) {
-        fRunBuffer.push_back(line);
-    }
-
-    file2.close();
 }
 
-void TRestRawDAQMetadata::PrintRunScript() {
-    for (unsigned int i = 0; i < fRunBuffer.size(); i++) cout << fRunBuffer[i].Data() << endl;
-}
+void TRestRawDAQMetadata::ReadBaseIp( ){
 
-void TRestRawDAQMetadata::PrintPedScript() {
-    for (unsigned int i = 0; i < fPedBuffer.size(); i++) cout << fPedBuffer[i].Data() << endl;
+  std::string ip = GetParameter("baseIp","192.168.10.13");
+  sscanf(ip.c_str(),"%d:%d:%d:%d",&fBaseIp[0],&fBaseIp[1],&fBaseIp[2],&fBaseIp[3]);
+  std::cout<<"Base IP: "<<ip<<" --> "<<fBaseIp[0]<<" "<<fBaseIp[1]<<" "<<fBaseIp[2]<<" "<<fBaseIp[3]<<std::endl;
 }
 
-void TRestRawDAQMetadata::SetParFromPedBuffer() {
-    for (unsigned int i = 0; i < fPedBuffer.size(); i++) {
-        if (fPedBuffer[i].Contains("aget * gain * "))
-            fGain = GetValFromString("aget * gain * ", fPedBuffer[i]);
-
-        if (fPedBuffer[i].Contains("aget * time "))
-            fShappingTime = GetValFromString("aget * time ", fPedBuffer[i]);
-
-        if (fPedBuffer[i].Contains("after * gain * "))
-            fGain = GetValFromString("after * gain * ", fPedBuffer[i]);
-
-        if (fPedBuffer[i].Contains("after * time "))
-            fShappingTime = GetValFromString("after * time ", fPedBuffer[i]);
-    }
+void TRestRawDAQMetadata::PrintMetadata() {
+    metadata << "+++++++++++++++++++++++++++++++++++++++++++++" << endl;
+    metadata << this->ClassName() << " content" << endl;
+    metadata << "+++++++++++++++++++++++++++++++++++++++++++++" << endl;
+    metadata << "Base IP : " << fBaseIp[0]<<"."<< fBaseIp[1]<<"."<< fBaseIp[2]<<"."<< fBaseIp[3]<< endl;
+    metadata << "ElectronicsType : " << fElectronicsType.Data() << endl;
+    metadata << "FEC mask : 0x"<<std::hex << fFECMask <<std::dec<< endl;
+    metadata << "Gain : 0x"<<std::hex << fGain <<std::dec<< endl;
+    metadata << "Shapping time : 0x" <<std::hex << fShappingTime <<std::dec<< endl;
+    metadata << "Clock div : 0x" <<std::hex << fClockDiv <<std::dec<< endl;
+    metadata << "Trigger type : " << fTriggerType.Data() << endl;
+    metadata << "Acquisition type : " << fAcquisitionType.Data() << endl;
+    metadata << "Number of events : " << fNEvents << endl;
+    metadata << "+++++++++++++++++++++++++++++++++++++++++++++" << endl;
+    cout << endl;
 }
 
-UInt_t TRestRawDAQMetadata::GetValFromString(TString var, TString line) {
-    unsigned int val;
-
-    unsigned int varSize = var.Sizeof();
-    unsigned int lineSize = line.Sizeof();
 
-    // cout<<varSize<<"  "<<lineSize<<endl;
 
-    TString diff(line(varSize - 1, lineSize - 1));
 
-    cout << diff.Data() << endl;
-
-    sscanf(diff.Data(), "0x%x", &val);
-
-    return val;
-}

src/TRestRawSignal.cxx

@@ -85,6 +85,10 @@ TRestRawSignal::TRestRawSignal(Int_t nBins) {
     fSignalData.resize(nBins, 0);
 }
 
+TRestRawSignal::TRestRawSignal(Int_t sID, std::vector<Short_t> &sData) : fSignalID(sID), fSignalData(sData) {
+
+}
+
 ///////////////////////////////////////////////
 /// \brief Default destructor
 ///