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

correction of the DIAMANT frame type


git-svn-id: svn+ssh://anonsvn.in2p3.fr/agata/gammaware/trunk@2247 c3abf467-7ff2-0310-b516-c5fb849bdde0
parent cda9f28e
......@@ -31,7 +31,7 @@ using namespace ADF;
DIAMANTWatchers::DIAMANTWatchers(const char *name, const char *title, TDirectory *sp_dir, TDirectory *tag_dir) :
WatcherWithTag(name,title,sp_dir,tag_dir),
fBashColor(new BashColor()),
fMFMFrame(new MFMNedaFrame()),
fMFMFrame(new MFMDiamantFrame()),
fFrame(0x0)
{
memset(fStatPerBoard, 0, sizeof(UInt_t)*MaxDIAMANT*(MaxChannel+1));
......@@ -47,7 +47,7 @@ Bool_t DIAMANTWatchers::SetTrigger( ADF::DFTrigger *trigger )
return fFrame != 0x0;
}
MFMNedaFrame *DIAMANTWatchers::GetMFM()
MFMDiamantFrame *DIAMANTWatchers::GetMFM()
{
// cannot read the data
if( fFrame->GetFrame()->Read() == 0 ) {
......@@ -66,7 +66,7 @@ void DIAMANTWatchers::Exec(Option_t * /*option*/)
return;
}
MFMNedaFrame *mfmframe = GetMFM();
MFMDiamantFrame *mfmframe = GetMFM();
fADFTimestamp = ((AgataKey *)fFrame->GetFrame()->GetKey())->GetTimeStamp();
fMFMTimestamp = mfmframe->GetTimeStamp();
......
......@@ -33,7 +33,7 @@
#include "Rtypes.h"
// MFM
#include "MFMNedaFrame.h"
#include "MFMDiamantFrame.h"
class TH1F;
......@@ -49,7 +49,6 @@ using namespace Gw;
*/
class DIAMANTWatchers : public WatcherWithTag
{
protected:
static const Int_t MaxDIAMANT = 100;
static const Int_t MaxChannel = 16;
......@@ -60,11 +59,11 @@ protected:
//! main frame i.e. data:ranc0
SharedFP *fFrame = 0x0;
//! current data:ranc0 frame to help decoding one by one
MFMNedaFrame *fMFMFrame = 0x0;
MFMDiamantFrame *fMFMFrame = 0x0;
protected:
//! number of sub Frames extracted from the current event
MFMNedaFrame *GetMFM();
MFMDiamantFrame *GetMFM();
protected:
ULong64_t fADFTimestamp;
......
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