Commit 21d9209b authored by J.Dudouet [IPNL/CSNSM]'s avatar J.Dudouet [IPNL/CSNSM]
Browse files

correction of an error when vamos environment is defined


git-svn-id: svn+ssh://anonsvn.in2p3.fr/agata/gammaware/trunk@2241 c3abf467-7ff2-0310-b516-c5fb849bdde0
parent c780ec1a
......@@ -343,6 +343,8 @@ void LoadWatchers_ANCILLARIES()
else {
printf("{Conf} Set ANALYSIS_AGATA to ./ConfVAMOS \n"); gSystem->Setenv("ANALYSIS_AGATA","./ConfVAMOS");
}
LoadClass(Form("DefaultWatchers/%s/GANILWatchers.C",CAMPAIGN.Data()));
}
if ( GRUDIR != "" ) {
cout << "- Load libGRU.so from " << GRUDIR.Data() << endl;
......@@ -352,8 +354,6 @@ void LoadWatchers_ANCILLARIES()
gROOT->ProcessLine(tmp.Data());
}
//LoadClass(Form("DefaultWatchers/%s/GANILWatchers.C",CAMPAIGN.Data()));
LoadClass(Form("DefaultWatchers/%s/EventNEDAWatchers.C",CAMPAIGN.Data()));
LoadClass(Form("DefaultWatchers/%s/EventDIAMANTWatchers.C",CAMPAIGN.Data()));
......
......@@ -41,10 +41,13 @@
#ifdef WITH_MFM
#include "EventNEDAWatchers.h"
#include "EventDIAMANTWatchers.h"
#endif
//! always at least MFM ... other librarires, protection onside GANILWatchers.h
//#include "GANILWatchers.h"
#ifdef WITH_VAMOS
#include "GANILWatchers.h"
#endif
#endif
using namespace Gw;
using namespace ADF;
......@@ -210,7 +213,6 @@ Bool_t SetupWatchers(const char *df_type, FrameDispatcher *fd, const char *ext =
fd->SetTrigger(trig);
#ifdef HAS_VAMOS
fd->Add<VAMOSVertexBuilder>("VAMOSVertexBuilder","Check Doppler as computed by VAMOS");
VertexBuilder *fVertexBuilder = VertexBuilder::theCurrentVertexBuilder();
......@@ -261,7 +263,7 @@ Bool_t SetupWatchers(const char *df_type, FrameDispatcher *fd, const char *ext =
AgataFrameTrigger *trig =
AgataFrameTrigger::Build("NEDAB", "event:data:ranc0");
fd->SetTrigger(trig);
// TTreeMaster *rootmaster = fd->Add<TTreeMaster>("TreeMaster","Own the tree");
// rootmaster->Add<EventNEDATree>("NEDA","See Spectra in Out/NEDA_Spectra.root");
......
Markdown is supported
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