--- eventviewer/flight/src/FEVdetector.cpp	2007/03/20 15:22:00	1.17
+++ eventviewer/flight/src/FEVdetector.cpp	2007/03/30 11:16:43	1.18
@@ -134,41 +134,40 @@
 };
 
 void FEVdetector::GetWindow(){
-  printf(" ah \n");
   //
   if ( level.file == 2 ){
-    L2->GetEntry(maxevent);
+    L2->GetEntry(minevent);
   } else {
-    otr->GetEntry(maxevent);
+    otr->GetEntry(minevent);
   }
-  //
   if ( level.file < 2 ){
     ph = eh->GetPscuHeader();
-    lastevno = (int)ph->Counter;
+    firstevno = (int)ph->Counter;
   } else {
     if ( var.ORB ){
-      lastevno = L2->GetOrbitalInfo()->pkt_num; 
+      firstevno = L2->GetOrbitalInfo()->pkt_num; 
     } else {
-      lastevno = 0;
+      firstevno = 0;
     };
   };
-  printf(" mmh minev %u \n",minevent);
+  //
   if ( level.file == 2 ){
-    L2->GetEntry(minevent);
+    L2->GetEntry(maxevent);
   } else {
-    otr->GetEntry(minevent);
+    otr->GetEntry(maxevent);
   }
+  //
   if ( level.file < 2 ){
     ph = eh->GetPscuHeader();
-    firstevno = (int)ph->Counter;
+    lastevno = (int)ph->Counter;
   } else {
     if ( var.ORB ){
-      firstevno = L2->GetOrbitalInfo()->pkt_num; 
+      lastevno = L2->GetOrbitalInfo()->pkt_num; 
     } else {
-      firstevno = 0;
+      lastevno = 0;
     };
   };
-  printf(" aaah \n");
+  //
 }
 
 void FEVdetector::ClearVariables(){
@@ -193,9 +192,8 @@
 void FEVdetector::GetEntry(Int_t i){
   thisentry = i;  
   if ( level.file == 2 ){
-    printf("qui \n");
+    L2->Clear();
     L2->GetEntry(i);
-    printf("qua \n");
     ShowInfo("RunInfo");
     ShowInfo("SoftInfo");
     ShowInfo("OrbitalInfo");
@@ -346,7 +344,7 @@
   //  TObjArray *leaf_array = 0;		
   //
   if ( !strcmp(detector.Data(),"RunInfo") || !strcmp(detector.Data(),"SoftInfo") ){
-    if ( runtree ) b1 = runtree->FindBranch(detector.Data());
+    if ( L2->GetRunTree() ) b1 = L2->GetRunTree()->FindBranch(detector.Data());
   } else {
     b1 = otr->FindBranch(detector.Data());
   };
@@ -855,6 +853,11 @@
     trcs = (TString)trc.str().c_str();
   } else {
     headcold = headc;
+    if ( var.RUN ){
+      var.idrun = L2->GetRunInfo()->ID;
+      var.idroot = L2->GetRunInfo()->ID_ROOT_L0;
+      var.EVF = L2->GetRunInfo()->EV_FROM;
+    };
     if ( var.ORB ){
       headc = L2->GetOrbitalInfo()->pkt_num; 
       OBT = L2->GetOrbitalInfo()->OBT; 
@@ -1012,18 +1015,24 @@
   //
   file = &mainfile;
   //
-  if ( !L2 ) L2 = new PamLevel2(); 
-  //
   if ( level.file == 2 ){
     //
     printf(" %s \n",ddec.Data());
-    otr = L2->GetPamTree(gSystem->DirName(file->GetName()),file->GetName(),ddec.Data()); 
-    runtree = L2->GetRunTree(gSystem->DirName(file->GetName()),file->GetName()); 
+    if ( !L2 ){
+      L2 = new PamLevel2("",file->GetName(),ddec.Data()); 
+      otr = L2->GetPamTree();
+    } else {
+      //
+      otr = L2->GetPamTree(gSystem->DirName(file->GetName()),file->GetName(),ddec.Data()); 
+      L2->GetRunTree(gSystem->DirName(file->GetName()),file->GetName()); 
+      //
+    };
+    //
     //
     if ( !otr ) return(0);
     //
-    otr->CanDeleteRefs(true);
-    if ( runtree ) runtree->CanDeleteRefs(true);
+    //    otr->CanDeleteRefs(true);
+    //    if ( runtree ) runtree->CanDeleteRefs(true);
     //
   } else {
     //
@@ -5507,6 +5516,8 @@
 
 void FEVdetector::ShowTrack(){
   //
+  if ( level.file != 2 ) return;
+  //
   //
   //
   if ( var.CALO && var.CALOT ){
@@ -5604,14 +5615,16 @@
     };
   };
   //
-  if ( !var.TRK || level.file != 2 ) return;
+  if ( !var.TRK ) return;
   //
   if ( L2->GetTrkLevel2()->GetNTracks() > 0 ){
     for (Int_t nt = 0; nt < L2->GetTrkLevel2()->GetNTracks(); nt++){
 
       //      TrkTrack *track = L2->GetTrkLevel2()->GetTrack(nt); 
+      //      printf("qui \n");
       PamTrack *ptrack = L2->GetTrack(nt); 
       TrkTrack *track = ptrack->GetTrkTrack();
+      //      printf("qua \n");
       Int_t npoint = 100;
       Float_t zin[100];
       Double_t xout[100];
@@ -5819,8 +5832,8 @@
 	Int_t se = 5;
 	if ( !l && m%2 == 0 ) se = 3;
 	if ( !l && m%2 != 0 ) se = 2;
-	if (  l && m%2 == 0 ) se = 1;
-	if (  l && m%2 != 0 ) se = 0;
+	if (  l && m%2 != 0 ) se = 1;
+	if (  l && m%2 == 0 ) se = 0;
 	//
 	// determine what kind of event we are going to analyze
 	//
@@ -6027,8 +6040,8 @@
 	Int_t se = 5;
 	if (l == 0 && m%2 == 0) se = 3;
 	if (l == 0 && m%2 != 0) se = 2;
-	if (l == 1 && m%2 == 0) se = 1;
-	if (l == 1 && m%2 != 0) se = 0;		
+	if (l == 1 && m%2 != 0) se = 1;
+	if (l == 1 && m%2 == 0) se = 0;		
 	//
 	// determine what kind of event we are going to analyze
 	//