Commit 269658a2 authored by Georg Auzinger's avatar Georg Auzinger
Browse files

merged Subirs DQM fixes and debugged miniDQM further so it compiles -needs testing

parent a3bab125
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
//Glib Config Files //Glib Config Files
#define XML_DESCRIPTION_FILE_2CBC "settings/ICDescription.xml" #define XML_DESCRIPTION_FILE_2CBC "settings/ICDescription.xml"
#define XML_DESCRIPTION_FILE_4CBC "settings/HWDescription_2CBCxml.xml" #define XML_DESCRIPTION_FILE_4CBC "settings/HWDescription_2CBC.xml"
#define XML_DESCRIPTION_FILE_8CBC "settings/HWDescription_8CBC.xml" #define XML_DESCRIPTION_FILE_8CBC "settings/HWDescription_8CBC.xml"
#define XML_DESCRIPTION_FILE_16CBC "settings/Beamtest_Nov15.xml" #define XML_DESCRIPTION_FILE_16CBC "settings/Beamtest_Nov15.xml"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#define __DQMHISTOGRAMMER_H__ #define __DQMHISTOGRAMMER_H__
#include "../tools/Tool.h" #include "../tools/Tool.h"
#include "../Utils/easylogging++.h"
#include <vector> #include <vector>
#include <string> #include <string>
......
...@@ -52,9 +52,6 @@ INITIALIZE_EASYLOGGINGPP ...@@ -52,9 +52,6 @@ INITIALIZE_EASYLOGGINGPP
std::string getFileName() std::string getFileName()
{ {
//configure the logger
el::Configurations conf ("settings/logger.conf");
el::Loggers::reconfigureAllLoggers (conf);
std::string line; std::string line;
std::fstream cFile; std::fstream cFile;
...@@ -92,6 +89,9 @@ std::string getFileName() ...@@ -92,6 +89,9 @@ std::string getFileName()
int main ( int argc, char* argv[] ) int main ( int argc, char* argv[] )
{ {
//configure the logger
el::Configurations conf ("settings/logger.conf");
el::Loggers::reconfigureAllLoggers (conf);
int pEventsperVcth; int pEventsperVcth;
int cVcth; int cVcth;
......
...@@ -24,6 +24,7 @@ using namespace Ph2_HwInterface; ...@@ -24,6 +24,7 @@ using namespace Ph2_HwInterface;
using namespace Ph2_System; using namespace Ph2_System;
using namespace CommandLineProcessing; using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
void tokenize ( const std::string& str, std::vector<std::string>& tokens, const std::string& delimiters ) void tokenize ( const std::string& str, std::vector<std::string>& tokens, const std::string& delimiters )
{ {
...@@ -50,10 +51,10 @@ void dumpEvents ( const std::vector<Event*>& elist, size_t evt_limit ) ...@@ -50,10 +51,10 @@ void dumpEvents ( const std::vector<Event*>& elist, size_t evt_limit )
{ {
for ( int i = 0; i < min (elist.size(), evt_limit); i++ ) for ( int i = 0; i < min (elist.size(), evt_limit); i++ )
{ {
LOG (INFO) << "Event index: " << i + 1 << std::endl; //LOG (INFO) << "Event index: " << i + 1 << std::endl;
std::stringstream outp; std::stringstream outp;
outp << *elist[i] << std::endl; outp << *elist[i] << std::endl;
LOG (INFO) << outp.str(); //LOG (INFO) << outp.str();
} }
} }
...@@ -239,7 +240,7 @@ int main ( int argc, char* argv[] ) ...@@ -239,7 +240,7 @@ int main ( int argc, char* argv[] )
LOG (INFO) << "Saving root file to " << dqmFilename << " and webpage to " << cDirBasePath ; LOG (INFO) << "Saving root file to " << dqmFilename << " and webpage to " << cDirBasePath ;
} }
else dumpEvents ( elist ); else dumpEvents ( elist, maxevt );
delete dqmh; delete dqmh;
return 0; return 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment