--- eventviewer/flight/inc/FEVdetector.h	2007/02/26 17:30:30	1.3
+++ eventviewer/flight/inc/FEVdetector.h	2009/06/12 12:37:24	1.10
@@ -43,6 +43,8 @@
 #include <TLeafF.h>
 #include <TLeafC.h>
 #include <TLeafD.h>
+#include <TBranchClones.h>
+#include <TStreamerInfo.h>
 //
 #include <PamLevel2.h>
 #include <PamelaRun.h>
@@ -64,9 +66,11 @@
 
  private:
   TCanvas *thefigure;
-  TFile *file;
-  TTree *otr;
-  PamLevel2 *L2;
+  //  TFile *file;
+  //  TTree *otr;
+  TChain *otr;
+  //  TTree *runtree;
+  //  TChain *runtree;
   pamela::PscuHeader *ph;
   pamela::EventHeader *eh;
   pamela::calorimeter::CalorimeterEvent *de;
@@ -77,8 +81,8 @@
   pamela::S4::S4Event  *s4;
   pamela::trigger::TriggerEvent *trigger;     
   pamela::tof::TofEvent  *tof;
-  OrbitalInfo *oinfoL2;
-  ItoRunInfo *runinfo;
+  //  OrbitalInfo *oinfoL2;
+  //  ItoRunInfo *runinfo;
   PAMevcontrol *pamgui;
   Int_t *ctrlword;
   Int_t thisentry;
@@ -98,8 +102,11 @@
   void ShowAC();
   void ShowS4(Bool_t upd);
   void ShowND();
-  void PrintData(TTree *,Long64_t, Int_t);
-  void PrintLeaves(TTree *, Int_t, TBranchElement *,Int_t);
+
+  //  void PrintData(TTree *,Long64_t, Int_t);
+  //  void PrintLeaves(TTree *, Int_t, TBranchElement *,Int_t);
+  void ShowInfo(TString);
+
   void Calo1stcalib();
   int OLDCaloFindCalibs();
   int CaloPede(Int_t s);
@@ -107,6 +114,7 @@
   void CaloCompressData(Int_t l, Int_t m, Int_t pre);
 
  public:
+  PamLevel2 *L2;
   struct Levels level;
   struct Variables var;
   TString ddec;
@@ -133,9 +141,13 @@
   void SetGUIPtr(PAMevcontrol &mainpamgui);
   void SetDDEC(TString);
   void checkctrlword();
+  void Reset();
   void add(TString name);
-  Int_t Load(TTree &mainotr, TFile &mainfile);
-  //  Int_t Load(TChain &mainotr, TFile &mainfile);
+  //Int_t Load(TTree &mainotr, TFile &mainfile);
+  //  TChain *Load(TFile &mainfile);
+  TChain *Load(TString mainfile);
+  TChain *GetChain(){return otr;};
+  //  TChain *GetRunChain(){return runtree;};
   void GetWindow();
   void ClearVariables();
   void GetEntry(Int_t i);
@@ -146,6 +158,9 @@
   int GetThisEntry(){return (thisentry);};
   int GetCounter();
   int SelectEvent();
+  //
+  PamLevel2 *GetL2(){return L2;};
+  //
 };
 
 #endif