Commit ec74e750 authored by mbsdaq's avatar mbsdaq

Modification of the crate configuration

parent 13493d00
...@@ -27,8 +27,15 @@ TNeAnalysis::TNeAnalysis() ...@@ -27,8 +27,15 @@ TNeAnalysis::TNeAnalysis()
:fMbsEvent(0) :fMbsEvent(0)
,fEvents(0) ,fEvents(0)
,fLastEvent(0) ,fLastEvent(0)
,p_T1xa(0) ,p_Lxa(0)
,p_T1ya(0) ,p_Lya(0)
,p_Rxa(0)
,p_Rya(0)
,p_RVa(0)
,p_R60a(0)
,p_AnSa(0)
,p_AnRa(0)
,p_AnVa(0)
{ {
} }
//*********************************************************** //***********************************************************
...@@ -39,8 +46,15 @@ TNeAnalysis::TNeAnalysis(int argc, char** argv) ...@@ -39,8 +46,15 @@ TNeAnalysis::TNeAnalysis(int argc, char** argv)
,fMbsEvent(0) ,fMbsEvent(0)
,fEvents(0) ,fEvents(0)
,fLastEvent(0) ,fLastEvent(0)
,p_T1xa(0) ,p_Lxa(0)
,p_T1ya(0) ,p_Lya(0)
,p_Rxa(0)
,p_Rya(0)
,p_RVa(0)
,p_R60a(0)
,p_AnSa(0)
,p_AnRa(0)
,p_AnVa(0)
{ {
cout << "**** Create TNeAnalysis name: " << argv[0] << endl; cout << "**** Create TNeAnalysis name: " << argv[0] << endl;
...@@ -84,10 +98,24 @@ TNeAnalysis::TNeAnalysis(int argc, char** argv) ...@@ -84,10 +98,24 @@ TNeAnalysis::TNeAnalysis(int argc, char** argv)
// At this point, autosave file has not yet been read! // At this point, autosave file has not yet been read!
// Therefore parameter values set here will be overwritten // Therefore parameter values set here will be overwritten
// if an autosave file is there. // if an autosave file is there.
p_T1xa = new TNeDet16("T1xa"); p_Lxa = new TNeDet16("Lxa");
p_T1ya = new TNeDet16("T1ya"); p_Lya = new TNeDet16("Lya");
AddParameter(p_T1xa); p_Rxa = new TNeDet16("Rxa");
AddParameter(p_T1ya); p_Rya = new TNeDet16("Rya");
p_RVa = new TNeDet16("RVa");
p_R60a = new TNeDet16("R60a");
p_AnSa = new TNeDet16("AnSa");
p_AnRa = new TNeDet16("AnRa");
p_AnVa = new TNeDet16("AnVa");
AddParameter(p_Lxa);
AddParameter(p_Lya);
AddParameter(p_Rxa);
AddParameter(p_Rya);
AddParameter(p_RVa);
AddParameter(p_R60a);
AddParameter(p_AnSa);
AddParameter(p_AnRa);
AddParameter(p_AnVa);
// pMTracks = new TNeMParms("MTRACKS"); // pMTracks = new TNeMParms("MTRACKS");
// AddParameter(pMTracks); // AddParameter(pMTracks);
...@@ -126,8 +154,15 @@ Int_t TNeAnalysis::UserPreLoop() ...@@ -126,8 +154,15 @@ Int_t TNeAnalysis::UserPreLoop()
} }
fEvents=0; // event counter fEvents=0; // event counter
fLastEvent=0; // number of last event processed fLastEvent=0; // number of last event processed
p_T1xa->ReadData(); p_Lxa->ReadData();
// p_T1ya->ReadData();>Z p_Lya->ReadData();
p_Rxa->ReadData();
p_Rya->ReadData();
p_RVa->ReadData();
p_R60a->ReadData();
p_AnSa->ReadData();
p_AnRa->ReadData();
p_AnVa->ReadData();
return 0; return 0;
......
...@@ -29,8 +29,15 @@ public: ...@@ -29,8 +29,15 @@ public:
virtual Int_t UserEventFunc(); virtual Int_t UserEventFunc();
virtual Int_t UserPostLoop(); virtual Int_t UserPostLoop();
TNeDet16* p_T1xa; TNeDet16* p_Lxa;
TNeDet16* p_T1ya; TNeDet16* p_Lya;
TNeDet16* p_Rxa;
TNeDet16* p_Rya;
TNeDet16* p_RVa;
TNeDet16* p_R60a;
TNeDet16* p_AnSa;
TNeDet16* p_AnRa;
TNeDet16* p_AnVa;
// TNeMParms* pMTracks; // TNeMParms* pMTracks;
ClassDef(TNeAnalysis,1) ClassDef(TNeAnalysis,1)
......
...@@ -30,11 +30,25 @@ void TNeEvent::Clear(Option_t *t) ...@@ -30,11 +30,25 @@ void TNeEvent::Clear(Option_t *t)
//== all members should be cleared. //== all members should be cleared.
//== memset(fRawData,0, sizeof(fRawData)); //== memset(fRawData,0, sizeof(fRawData));
//================================================================== //==================================================================
// SQ // Si
memset(T1xa, 0, sizeof(T1xa)); memset(Lxa, 0, sizeof(Lxa));
memset(T1xt, 0, sizeof(T1xt)); memset(Lxt, 0, sizeof(Lxt));
memset(T1ya, 0, sizeof(T1ya)); memset(Lya, 0, sizeof(Lya));
memset(T1yt, 0, sizeof(T1yt)); memset(Lyt, 0, sizeof(Lyt));
memset(Rxa, 0, sizeof(Rxa));
memset(Rxt, 0, sizeof(Rxt));
memset(Rya, 0, sizeof(Rya));
memset(Ryt, 0, sizeof(Ryt));
memset(RVa, 0, sizeof(RVa));
memset(RVt, 0, sizeof(RVt));
memset(R60a, 0, sizeof(R60a));
memset(R60t, 0, sizeof(R60t));
memset(AnSa, 0, sizeof(AnSa));
memset(AnSt, 0, sizeof(AnSt));
memset(AnRa, 0, sizeof(AnRa));
memset(AnRt, 0, sizeof(AnRt));
memset(AnVa, 0, sizeof(AnVa));
memset(AnVt, 0, sizeof(AnVt));
// ToF // ToF
memset(F3, 0, sizeof(F3)); memset(F3, 0, sizeof(F3));
......
...@@ -18,11 +18,25 @@ public: ...@@ -18,11 +18,25 @@ public:
/** Method called by the framework to clear the event element. */ /** Method called by the framework to clear the event element. */
void Clear(Option_t *t=""); void Clear(Option_t *t="");
//-----SQ----- //-----Si-----
unsigned short T1xa[16]; unsigned short Lxa[16];
unsigned short T1xt[16]; unsigned short Lxt[16];
unsigned short T1ya[16]; unsigned short Lya[16];
unsigned short T1yt[16]; unsigned short Lyt[16];
unsigned short Rxa[16];
unsigned short Rxt[16];
unsigned short Rya[16];
unsigned short Ryt[16];
unsigned short RVa[16];
unsigned short RVt[16];
unsigned short R60a[16];
unsigned short R60t[16];
unsigned short AnSa[16];
unsigned short AnSt[16];
unsigned short AnRa[16];
unsigned short AnRt[16];
unsigned short AnVa[16];
unsigned short AnVt[16];
unsigned short F3[4]; unsigned short F3[4];
unsigned short tF3[4]; unsigned short tF3[4];
......
This diff is collapsed.
...@@ -26,14 +26,27 @@ private: ...@@ -26,14 +26,27 @@ private:
// //
//-----SQ----- //-----SQ-----
//-----raw----- //-----raw-----
TH2 * hT1a; TH1 *d1Lxa[16];
TH2 * hT1t; TH1 *d1Lxt[16];
TH1 *d1T1xa[16]; TH1 *d1Lxc[16];
TH1 *d1T1xt[16]; TH1 *d1Lya[16];
TH1 *d1T1xc[16]; TH1 *d1Lyt[16];
TH1 *d1T1ya[16]; TH1 *d1Lyc[16];
TH1 *d1T1yt[16]; TH1 *d1Rxa[16];
TH1 *d1T1yc[16]; TH1 *d1Rxt[16];
TH1 *d1Rxc[16];
TH1 *d1Rya[16];
TH1 *d1Ryt[16];
TH1 *d1Ryc[16];
TH1 *d1AnSa[16];
TH1 *d1AnSt[16];
TH1 *d1AnSc[16];
TH1 *d1AnRa[16];
TH1 *d1AnRt[16];
TH1 *d1AnRc[16];
TH1 *d1AnVa[16];
TH1 *d1AnVt[16];
TH1 *d1AnVc[16];
//-----clb----- //-----clb-----
TH1 *d1sq1_x_c[16]; TH1 *d1sq1_x_c[16];
//-----ToF+MWPC----- //-----ToF+MWPC-----
......
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