--- quicklook/QLflightTmtc_Header/PacketScan.cpp	2006/06/16 10:11:54	1.1
+++ quicklook/QLflightTmtc_Header/PacketScan.cpp	2007/03/08 09:53:45	1.4
@@ -1,4 +1,3 @@
-
 /**
 * Packet Scan
 * author  Marcelli
@@ -30,6 +29,11 @@
 * For compilation: 
 *     Added function "int main(int argc, char* argv[])"
 *
+* Version 1.7
+* Date 7 March 2007 - Malvezzi
+*
+* Description: to read correctly the OBT changed the type of time variables from signed to unsigned 
+*
 * 
 * Description: To show packet type recorded by PAMELA (Packet type vs. OBT)
 *
@@ -42,7 +46,8 @@
 */
 
 
-
+#include <stdio.h>
+#include <string.h>
 #include <fstream>
 #include <sstream>
 #include <iostream>
@@ -60,8 +65,7 @@
 
 using namespace std;
 
-void PacketScan(TString base, TString outDir, TString format)
-{
+void PacketScan(TString base, TString outDir, TString format){
 
   TFile *file = new TFile(base.Data());
   
@@ -78,8 +82,9 @@
   pamela::EventHeader *eh = 0;
   pamela::PscuHeader *ph = 0;
   
-  Float_t obt[1]={0};
-  Float_t id[1]={0};
+  ULong_t utile=0;
+  Double_t obt[1]={0};
+  Double_t id[1]={0};
   Int_t cont[48]={0};
   std::stringstream oss, oss1, oss2, oss3;
  
@@ -94,40 +99,40 @@
   finalCanv1->SetFillColor(10);
   TMultiGraph *mg1 = new TMultiGraph();
   mg1->SetTitle(oss.str().c_str());
-  TLegend *leg1 = new TLegend(0.82,0.60,0.99,0.99, "");
+  TLegend *leg1b = new TLegend(0.80,0.67,0.99,0.99, "");
  
 
   TCanvas *finalCanv2 = new TCanvas("Packet_2", "PacketScan2", 1280, 1024);
   finalCanv2->SetFillColor(10);
   TMultiGraph *mg2 = new TMultiGraph();
   mg2->SetTitle(oss.str().c_str());
-  TLegend *leg2 = new TLegend(0.82,0.60,0.99,0.99, "");
+  TLegend *leg2 = new TLegend(0.87,0.70,0.99,0.99, "");
+  
 
 
   TCanvas *finalCanv3 = new TCanvas("Packet_3", "PacketScan3", 1280, 1024);
   finalCanv3->SetFillColor(10);
   TMultiGraph *mg3 = new TMultiGraph();
   mg3->SetTitle(oss.str().c_str());
-  TLegend *leg3 = new TLegend(0.82,0.60,0.99,0.99, "");
-  
+  TLegend *leg3 = new TLegend(0.87,0.65,0.99,0.99, "");
 
+  TObject *key = new TObject;
+  const char *name;
+  char *SoftInfo="SoftInfo";
   for (Int_t i=0; i<numkey; i++){
-    TObject *key = list->At(i);
-    char *name=(char *)(key->GetName());
+    key = list->At(i);
+    name=(char *)(key->GetName());
+    if(strcmp(name,SoftInfo)==0)continue;
     TTree* tr = (TTree*)file->Get(name);
-    while((tr->IsZombie())){
-      i++;
-      TObject *key = list->At(i);
-      char *name=(char *)(key->GetName());
-      TTree* tr = (TTree*)file->Get(name);
-    }
+    if (tr->IsZombie()) continue;
     Long64_t nevents = tr->GetEntries(); 
     const Int_t size = nevents;
     tr->SetBranchAddress("Header", &eh);  
     for (Int_t j = 0; j < size; j++){
       tr->GetEntry(j); 
       ph = eh->GetPscuHeader();
-      obt[0]= ph->GetOrbitalTime();
+      utile=ph->GetOrbitalTime();
+      obt[0]= utile;
       id[0]=(ph->GetPacketId1());
       Int_t type = (int)id[0];
       switch(type){
@@ -136,9 +141,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(0.7);
+	graph->SetMarkerSize(0.6);
 	mg1->Add(graph);
-	if (cont[0]==0)  leg1->AddEntry(graph,"Physic End_Run (7=0x07)","p");
+	if (cont[0]==0)  leg1b->AddEntry(graph,"PhysEndRun (0x07)","p");
 	cont[0]++;
 	break;
       }
@@ -146,9 +151,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(0.6);
+	graph->SetMarkerSize(0.5);
 	mg1->Add(graph);
-	if (cont[1]==0)  leg1->AddEntry(graph,"EVENT PACKET (16=0x10)","p");
+	if (cont[1]==0)  leg1b->AddEntry(graph,"Physics (0x10)","p");
 	cont[1]++;
 	break;
       }
@@ -156,9 +161,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg1->Add(graph);
-	if (cont[2]==0)  leg1->AddEntry(graph,"Run Header (32=0x20)- Run Trailer (33=0x21)","p");
+	if (cont[2]==0)  leg1b->AddEntry(graph,"RunHeader/Trailer (0x20/21)","p");
 	cont[2]++;
 	break;
       }
@@ -166,9 +171,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg1->Add(graph);
-	if (cont[2]==0)  leg1->AddEntry(graph,"Run Header (32=0x20)- Run Trailer (33=0x21)","p");
+	if (cont[2]==0)  leg1b->AddEntry(graph,"RunHeader/Trailer (0x20/21)","p");
 	cont[2]++;
 	break;
       }
@@ -177,9 +182,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[23]==0)  leg1->AddEntry(graph,"Calib Cal_Pulse1 (8=0x08)","p");
+	if (cont[23]==0)  leg1b->AddEntry(graph,"CalibCalPulse1 (0x08)","p");
 	cont[23]++;
 	break;
       }
@@ -187,9 +192,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[24]==0)  leg1->AddEntry(graph,"Calib Cal_Pulse2 (9=0x09)","p");
+	if (cont[24]==0)  leg1b->AddEntry(graph,"CalibCalPulse2 (0x09)","p");
 	cont[24]++;
 	break;
       }
@@ -197,9 +202,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[25]==0)  leg1->AddEntry(graph,"Calib_Trk_Both (17=0x11)","p");
+	if (cont[25]==0)  leg1b->AddEntry(graph,"CalibTrkBoth (0x11)","p");
 	cont[25]++;
 	break;
       }
@@ -207,9 +212,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(5);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[26]==0)  leg1->AddEntry(graph,"Calib_Trk_1 (18=0x12)","p");
+	if (cont[26]==0)  leg1b->AddEntry(graph,"CalibTrk1 (0x12)","p");
 	cont[26]++;
 	break;
       }
@@ -217,19 +222,19 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(6);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[27]==0)  leg1->AddEntry(graph,"Calib_Trk_2 (19=0x13)","p");
+	if (cont[27]==0)  leg1b->AddEntry(graph,"CalibTrk2 (0x13)","p");
 	cont[27]++;
 	break;
       }
-      case 21:{
+      case 29:{
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(30);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[28]==0)  leg1->AddEntry(graph,"Calib_Trd (21=0x15)","p");
+	if (cont[28]==0)  leg1b->AddEntry(graph,"Calib_Cal (0x1d)","p");
 	cont[28]++;
 	break;
       }
@@ -237,9 +242,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(9);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[29]==0)  leg1->AddEntry(graph,"Calib_Tof (22=0x16)","p");
+	if (cont[29]==0)  leg1b->AddEntry(graph,"CalibTof (0x16)","p");
 	cont[29]++;
 	break;
       }
@@ -247,9 +252,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(7);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[30]==0)  leg1->AddEntry(graph,"Calib_S4 (23=0x17)","p");
+	if (cont[30]==0)  leg1b->AddEntry(graph,"CalibS4 (0x17)","p");
 	cont[30]++;
 	break;
       }
@@ -257,19 +262,19 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(49);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[31]==0)  leg1->AddEntry(graph,"Calib_Cal_Ped (24=0x18)","p");
+	if (cont[31]==0)  leg1b->AddEntry(graph,"CalibCalPed (0x18)","p");
 	cont[31]++;
 	break;
       }
       case 25:{
-	TGraph *graph = new TGraph(1, obt, id);
+	TGraph *graph = new TGraph(1,obt,id);
 	graph->SetMarkerColor(33);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[32]==0)  leg1->AddEntry(graph,"Calib1_Ac_1 (25=0x19)","p");
+	if (cont[32]==0)  leg1b->AddEntry(graph,"Calib1_Ac1 (0x19)","p");
 	cont[32]++;
 	break;
       }
@@ -277,9 +282,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(21);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[33]==0)  leg1->AddEntry(graph,"Calib2_Ac_1 (26=0x1a)","p");
+	if (cont[33]==0)  leg1b->AddEntry(graph,"Calib2_Ac1 (0x1a)","p");
 	cont[33]++;
 	break;
       }
@@ -287,9 +292,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(16);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[34]==0)  leg1->AddEntry(graph,"Calib1_Ac_2 (27=0x1b)","p");
+	if (cont[34]==0)  leg1b->AddEntry(graph,"Calib1_Ac2 (0x1b)","p");
 	cont[34]++;
 	break;
       }
@@ -297,9 +302,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(37);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[35]==0)  leg1->AddEntry(graph,"Calib2_Ac_2 (28=0x1c)","p");
+	if (cont[35]==0)  leg1b->AddEntry(graph,"Calib2_Ac2 (0x1c)","p");
 	cont[35]++;
 	break;
       }
@@ -307,9 +312,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(41);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[36]==0)  leg1->AddEntry(graph,"Calib_Header (34=0x22) - Calib Trailer (35=0x23)","p");
+	if (cont[36]==0)  leg1b->AddEntry(graph,"CalibHeader/Trailer (0x22/23)","p");
 	cont[36]++;
 	break;
       }
@@ -317,9 +322,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(41);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[36]==0)  leg1->AddEntry(graph,"Calib_Header (34=0x22) - Calib Trailer (35=0x23)","p");
+	if (cont[36]==0)  leg1b->AddEntry(graph,"CalibHeader/Trailer (0x22/23)","p");
 	cont[36]++;
 	break;
       }
@@ -328,9 +333,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(20);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[4]==0)  leg1->AddEntry(graph,"init header (36=0x24)- init trailer (37=0x25)","p");
+	if (cont[4]==0)  leg1b->AddEntry(graph,"InitHeader/Trailer (0x24/25)","p");
 	cont[4]++;
 	break;
       }
@@ -338,9 +343,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(20);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.2);
 	mg1->Add(graph);
-	if (cont[4]==0)  leg1->AddEntry(graph,"init header (36=0x24)- init trailer (37=0x25)","p");
+	if (cont[4]==0)  leg1b->AddEntry(graph,"InitHeader/Trailer (0x24/25)","p");
 	cont[4]++;
 	break;
       } 
@@ -348,9 +353,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[38]==0)  leg2->AddEntry(graph,"Event_Tracker (48=0x30)","p");
+	if (cont[38]==0)  leg2->AddEntry(graph,"EventTrk (0x30)","p");
 	cont[38]++;
 	break;
       }
@@ -359,9 +364,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[39]==0)  leg2->AddEntry(graph,"Test_trk (64=0x40)","p");
+	if (cont[39]==0)  leg2->AddEntry(graph,"Test_trk (0x40)","p");
 	cont[39]++;
 	break;
       }
@@ -369,9 +374,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[40]==0)  leg2->AddEntry(graph,"Test_Tof (65=0x41)","p");
+	if (cont[40]==0)  leg2->AddEntry(graph,"Test_Tof (0x41)","p");
 	cont[40]++;
 	break;
       }
@@ -380,9 +385,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[41]==0)  leg2->AddEntry(graph,"Log Block (80=0x50)","p");
+	if (cont[41]==0)  leg2->AddEntry(graph,"Log (0x50)","p");
 	cont[41]++;
 	break;
       }
@@ -391,9 +396,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[42]==0)  leg2->AddEntry(graph,"Vardump Block (81=0X51)","p");
+	if (cont[42]==0)  leg2->AddEntry(graph,"VarDump (0X51)","p");
 	cont[42]++;
 	break;
       }
@@ -401,9 +406,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[43]==0)  leg2->AddEntry(graph,"Arrdump Block (82=0x52)","p");
+	if (cont[43]==0)  leg2->AddEntry(graph,"ArrDump (x52)","p");
 	cont[43]++;
 	break;
       }
@@ -411,9 +416,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(23);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[44]==0)  leg2->AddEntry(graph,"Tabdump Block (83=0x53)","p");
+	if (cont[44]==0)  leg2->AddEntry(graph,"TabDump (0x53)","p");
 	cont[44]++;
 	break;
       }
@@ -422,9 +427,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[45]==0)  leg2->AddEntry(graph,"Tmtc Block (84=0x54)","p");
+	if (cont[45]==0)  leg2->AddEntry(graph,"Tmtc (0x54)","p");
 	cont[45]++;
 	break;
       }
@@ -433,19 +438,29 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
-	if (cont[46]==0)  leg2->AddEntry(graph,"Mcmd Block (85=0x55)","p");
+	if (cont[46]==0)  leg2->AddEntry(graph,"Mcmd (0x55)","p");
 	cont[46]++;
 	break;
       } 
+     case 96:{
+	TGraph *graph = new TGraph(1, obt, id);
+	graph->SetMarkerColor(20);
+	graph->SetMarkerStyle(21);
+	graph->SetMarkerSize(0.9);
+	mg2->Add(graph);
+	if (cont[22]==0) leg2->AddEntry(graph,"ForceFECmd (0x60)","p");
+	cont[22]++;
+	break;
+      }
       case 112:{
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(1);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[6]==0)  leg3->AddEntry(graph,"ac_1_init (112=0x70)","p");
+	if (cont[6]==0)  leg3->AddEntry(graph,"Ac1Init (0x70)","p");
 	cont[6]++;
 	break;
       }
@@ -453,9 +468,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[7]==0)  leg3->AddEntry(graph,"cal_init (113=0x71)","p");
+	if (cont[7]==0)  leg3->AddEntry(graph,"CalInit (0x71)","p");
 	cont[7]++;
 	break;
       }
@@ -463,9 +478,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[8]==0)  leg3->AddEntry(graph,"trk_init (114=0x72)","p");
+	if (cont[8]==0)  leg3->AddEntry(graph,"TrkInit (0x72)","p");
 	cont[8]++;
 	break;
       }
@@ -473,9 +488,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[9]==0)  leg3->AddEntry(graph,"tof_init (115=0x73)","p");
+	if (cont[9]==0)  leg3->AddEntry(graph,"TofInit (0x73)","p");
 	cont[9]++;
 	break;
       }
@@ -483,9 +498,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(5);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[10]==0)  leg3->AddEntry(graph,"trg_init (116=0x74)","p");
+	if (cont[10]==0)  leg3->AddEntry(graph,"TrgInit (0x74)","p");
 	cont[10]++;
 	break;
       }
@@ -493,9 +508,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(6);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[11]==0)  leg3->AddEntry(graph,"nd_init (117=0x75)","p");
+	if (cont[11]==0)  leg3->AddEntry(graph,"NdInit (0x75)","p");
 	cont[11]++;
 	break;
       }
@@ -503,9 +518,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(7);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[12]==0)  leg3->AddEntry(graph,"s4_init (118=0x76)","p");
+	if (cont[12]==0)  leg3->AddEntry(graph,"S4Init (0x76)","p");
 	cont[12]++;
 	break;
       }
@@ -513,9 +528,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(32);
 	graph->SetMarkerStyle(22);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.9);
 	mg3->Add(graph);
-	if (cont[13]==0)  leg3->AddEntry(graph,"ac_2_init (119=0x77)","p");
+	if (cont[13]==0)  leg3->AddEntry(graph,"Ac2Init (0x77)","p");
 	cont[13]++;
 	break;
       }
@@ -524,9 +539,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(1);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[14]==0)  leg3->AddEntry(graph,"cal_alarm (129=0x81)","p");
+	if (cont[14]==0)  leg3->AddEntry(graph,"CalAlarm (0x81)","p");
 	cont[14]++;
 	break;
       }
@@ -534,9 +549,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(42);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[15]==0) leg3->AddEntry(graph,"ac1_alarm (130=0x82)","p");
+	if (cont[15]==0) leg3->AddEntry(graph,"Ac1Alarm (0x82)","p");
 	cont[15]++;
 	break;
       }
@@ -544,9 +559,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(3);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph); 
-	if (cont[16]==0) leg3->AddEntry(graph,"trk_alarm (131=0x83)","p");
+	if (cont[16]==0) leg3->AddEntry(graph,"TrkAlarm (0x83)","p");
 	cont[16]++;
 	break;
       }
@@ -554,9 +569,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[17]==0) leg3->AddEntry(graph,"trg_alarm (132=0x84)","p");
+	if (cont[17]==0) leg3->AddEntry(graph,"TrgAlarm (0x84)","p");
 	cont[17]++;
 	break;
       }
@@ -564,9 +579,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(5);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[18]==0) leg3->AddEntry(graph,"tof_alarm (133=0x85)","p");
+	if (cont[18]==0) leg3->AddEntry(graph,"TofAlarm (0x85)","p");
 	cont[18]++;
 	break;
       }
@@ -574,9 +589,9 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(6);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[19]==0) leg3->AddEntry(graph,"s4_alarm (134=0x86)","p");
+	if (cont[19]==0) leg3->AddEntry(graph,"S4Alarm (0x86)","p");
 	cont[19]++;
 	break;
       }
@@ -584,13 +599,13 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(7);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(0.7);
 	mg3->Add(graph);
-	if (cont[20]==0) leg3->AddEntry(graph,"ac_alarm (136=0x88)","p");
+	if (cont[20]==0) leg3->AddEntry(graph,"Ac2Alarm (0x88)","p");
 	cont[20]++;
 	break;
       }
-      case 137:{
+	/*case 137:{
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(32);
 	graph->SetMarkerStyle(21);
@@ -599,7 +614,7 @@
 	if (cont[21]==0) leg3->AddEntry(graph,"ac2_alarm (137=0x89)","p");
 	cont[21]++;
 	break;
-      }
+	}
       case 138:{
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(20);
@@ -609,24 +624,24 @@
 	if (cont[22]==0) leg3->AddEntry(graph,"s4_adc_ac_2 (138=0x8a)","p");
 	cont[22]++;
 	break;
-      }
+      }*/
       case 161:{
 	TGraph *graph = new TGraph(1, obt, id);
-	graph->SetMarkerColor(3);
-	graph->SetMarkerStyle(5);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerColor(2);
+	graph->SetMarkerStyle(3);
+	graph->SetMarkerSize(1.1);
 	mg3->Add(graph);
-	if (cont[3]==0) leg3->AddEntry(graph,"TSB_T (161=0xA1)","p");
+	if (cont[3]==0) leg3->AddEntry(graph,"TsbT (0xA1)","p");
 	cont[3]++;
 	break;
       }
       case 171:{
 	TGraph *graph = new TGraph(1, obt, id);
-	graph->SetMarkerColor(6);
-	graph->SetMarkerStyle(5);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerColor(4);
+	graph->SetMarkerStyle(3);
+	graph->SetMarkerSize(1.1);
 	mg3->Add(graph);
-	if (cont[5]==0) leg3->AddEntry(graph,"TSB_B (171=0xAB)","p");
+	if (cont[5]==0) leg3->AddEntry(graph,"TsbB (0xAB)","p");
 	cont[5]++;
 	break;
       }
@@ -641,21 +656,31 @@
 
   finalCanv1->cd();
   mg1->SetMinimum(0);
-  mg1->SetMaximum(50);	
+  mg1->SetMaximum(55);	
   mg1->Draw("AP");
-  leg1->Draw();	
+  mg1->GetXaxis()->SetTitle("OBT (ms)");
+  mg1->GetXaxis()->CenterTitle();
+  mg1->GetYaxis()->SetTitle("Packet ID");
+  mg1->GetYaxis()->CenterTitle();	
+  leg1b->Draw();
   oss1.str("");
   oss1 << outDir.Data() << filename.Data() << "_PacketScan_1." << format.Data();
+  finalCanv1->Update();
   finalCanv1->SaveAs(oss1.str().c_str());
   
 
   finalCanv2->cd();
-  mg2->SetMinimum(50);
-  mg2->SetMaximum(110);	
+  mg2->SetMinimum(60);
+  mg2->SetMaximum(100);	
   mg2->Draw("AP");
+  mg2->GetXaxis()->SetTitle("OBT (ms)");
+  mg2->GetXaxis()->CenterTitle();
+  mg2->GetYaxis()->SetTitle("Packet ID");
+  mg2->GetYaxis()->CenterTitle();
   leg2->Draw();	
   oss2.str("");
   oss2 << outDir.Data() << filename.Data() << "_PacketScan_2." << format.Data();
+  finalCanv2->Update();
   finalCanv2->SaveAs(oss2.str().c_str());
   
 
@@ -663,9 +688,14 @@
   mg3->SetMinimum(110);
   mg3->SetMaximum(180);	
   mg3->Draw("AP");
+  mg3->GetXaxis()->SetTitle("OBT (ms)");
+  mg3->GetXaxis()->CenterTitle();
+  mg3->GetYaxis()->SetTitle("Packet ID");
+  mg3->GetYaxis()->CenterTitle();
   leg3->Draw(); 
   oss3.str("");
   oss3 << outDir.Data() << filename.Data() << "_PacketScan_3." << format.Data();
+  finalCanv3->Update();
   finalCanv3->SaveAs(oss3.str().c_str());