--- quicklook/QLflightTmtc_Header/PacketScan.cpp	2006/06/17 11:02:09	1.1.1.2
+++ quicklook/QLflightTmtc_Header/PacketScan.cpp	2006/10/24 08:23:17	1.3
@@ -42,7 +42,8 @@
 */
 
 
-
+#include <stdio.h>
+#include <string.h>
 #include <fstream>
 #include <sstream>
 #include <iostream>
@@ -60,8 +61,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());
   
@@ -110,18 +110,16 @@
   TMultiGraph *mg3 = new TMultiGraph();
   mg3->SetTitle(oss.str().c_str());
   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);  
@@ -137,7 +135,7 @@
 	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)  leg1b->AddEntry(graph,"PhysEndRun (0x07)","p");
 	cont[0]++;
@@ -147,7 +145,7 @@
 	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)  leg1b->AddEntry(graph,"Physics (0x10)","p");
 	cont[1]++;
@@ -157,7 +155,7 @@
 	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)  leg1b->AddEntry(graph,"RunHeader/Trailer (0x20/21)","p");
 	cont[2]++;
@@ -167,7 +165,7 @@
 	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)  leg1b->AddEntry(graph,"RunHeader/Trailer (0x20/21)","p");
 	cont[2]++;
@@ -178,7 +176,7 @@
 	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)  leg1b->AddEntry(graph,"CalibCalPulse1 (0x08)","p");
 	cont[23]++;
@@ -188,7 +186,7 @@
 	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)  leg1b->AddEntry(graph,"CalibCalPulse2 (0x09)","p");
 	cont[24]++;
@@ -198,7 +196,7 @@
 	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)  leg1b->AddEntry(graph,"CalibTrkBoth (0x11)","p");
 	cont[25]++;
@@ -208,7 +206,7 @@
 	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)  leg1b->AddEntry(graph,"CalibTrk1 (0x12)","p");
 	cont[26]++;
@@ -218,7 +216,7 @@
 	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)  leg1b->AddEntry(graph,"CalibTrk2 (0x13)","p");
 	cont[27]++;
@@ -228,7 +226,7 @@
 	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)  leg1b->AddEntry(graph,"Calib_Cal (0x1d)","p");
 	cont[28]++;
@@ -238,7 +236,7 @@
 	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)  leg1b->AddEntry(graph,"CalibTof (0x16)","p");
 	cont[29]++;
@@ -248,7 +246,7 @@
 	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)  leg1b->AddEntry(graph,"CalibS4 (0x17)","p");
 	cont[30]++;
@@ -258,7 +256,7 @@
 	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)  leg1b->AddEntry(graph,"CalibCalPed (0x18)","p");
 	cont[31]++;
@@ -268,7 +266,7 @@
 	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)  leg1b->AddEntry(graph,"Calib1_Ac1 (0x19)","p");
 	cont[32]++;
@@ -278,7 +276,7 @@
 	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)  leg1b->AddEntry(graph,"Calib2_Ac1 (0x1a)","p");
 	cont[33]++;
@@ -288,7 +286,7 @@
 	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)  leg1b->AddEntry(graph,"Calib1_Ac2 (0x1b)","p");
 	cont[34]++;
@@ -298,7 +296,7 @@
 	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)  leg1b->AddEntry(graph,"Calib2_Ac2 (0x1c)","p");
 	cont[35]++;
@@ -308,7 +306,7 @@
 	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)  leg1b->AddEntry(graph,"CalibHeader/Trailer (0x22/23)","p");
 	cont[36]++;
@@ -318,7 +316,7 @@
 	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)  leg1b->AddEntry(graph,"CalibHeader/Trailer (0x22/23)","p");
 	cont[36]++;
@@ -329,7 +327,7 @@
 	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)  leg1b->AddEntry(graph,"InitHeader/Trailer (0x24/25)","p");
 	cont[4]++;
@@ -339,7 +337,7 @@
 	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)  leg1b->AddEntry(graph,"InitHeader/Trailer (0x24/25)","p");
 	cont[4]++;
@@ -349,7 +347,7 @@
 	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,"EventTrk (0x30)","p");
 	cont[38]++;
@@ -360,7 +358,7 @@
 	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 (0x40)","p");
 	cont[39]++;
@@ -370,7 +368,7 @@
 	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 (0x41)","p");
 	cont[40]++;
@@ -381,7 +379,7 @@
 	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 (0x50)","p");
 	cont[41]++;
@@ -392,7 +390,7 @@
 	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 (0X51)","p");
 	cont[42]++;
@@ -402,7 +400,7 @@
 	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 (x52)","p");
 	cont[43]++;
@@ -412,7 +410,7 @@
 	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 (0x53)","p");
 	cont[44]++;
@@ -423,7 +421,7 @@
 	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 (0x54)","p");
 	cont[45]++;
@@ -434,7 +432,7 @@
 	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 (0x55)","p");
 	cont[46]++;
@@ -444,7 +442,7 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(20);
 	graph->SetMarkerStyle(21);
-	graph->SetMarkerSize(1);
+	graph->SetMarkerSize(0.9);
 	mg2->Add(graph);
 	if (cont[22]==0) leg2->AddEntry(graph,"ForceFECmd (0x60)","p");
 	cont[22]++;
@@ -454,7 +452,7 @@
 	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,"Ac1Init (0x70)","p");
 	cont[6]++;
@@ -464,7 +462,7 @@
 	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,"CalInit (0x71)","p");
 	cont[7]++;
@@ -474,7 +472,7 @@
 	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,"TrkInit (0x72)","p");
 	cont[8]++;
@@ -484,7 +482,7 @@
 	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,"TofInit (0x73)","p");
 	cont[9]++;
@@ -494,7 +492,7 @@
 	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,"TrgInit (0x74)","p");
 	cont[10]++;
@@ -504,7 +502,7 @@
 	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,"NdInit (0x75)","p");
 	cont[11]++;
@@ -514,7 +512,7 @@
 	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,"S4Init (0x76)","p");
 	cont[12]++;
@@ -524,7 +522,7 @@
 	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,"Ac2Init (0x77)","p");
 	cont[13]++;
@@ -535,7 +533,7 @@
 	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,"CalAlarm (0x81)","p");
 	cont[14]++;
@@ -545,7 +543,7 @@
 	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,"Ac1Alarm (0x82)","p");
 	cont[15]++;
@@ -555,7 +553,7 @@
 	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,"TrkAlarm (0x83)","p");
 	cont[16]++;
@@ -565,7 +563,7 @@
 	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,"TrgAlarm (0x84)","p");
 	cont[17]++;
@@ -575,7 +573,7 @@
 	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,"TofAlarm (0x85)","p");
 	cont[18]++;
@@ -585,7 +583,7 @@
 	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,"S4Alarm (0x86)","p");
 	cont[19]++;
@@ -595,7 +593,7 @@
 	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,"Ac2Alarm (0x88)","p");
 	cont[20]++;
@@ -625,7 +623,7 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(2);
 	graph->SetMarkerStyle(3);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.1);
 	mg3->Add(graph);
 	if (cont[3]==0) leg3->AddEntry(graph,"TsbT (0xA1)","p");
 	cont[3]++;
@@ -635,7 +633,7 @@
 	TGraph *graph = new TGraph(1, obt, id);
 	graph->SetMarkerColor(4);
 	graph->SetMarkerStyle(3);
-	graph->SetMarkerSize(1.3);
+	graph->SetMarkerSize(1.1);
 	mg3->Add(graph);
 	if (cont[5]==0) leg3->AddEntry(graph,"TsbB (0xAB)","p");
 	cont[5]++;