--- quicklook/tracker/flight/macros/FTrkQLook_EXPERT.cxx 2006/09/18 15:01:56 1.17 +++ quicklook/tracker/flight/macros/FTrkQLook_EXPERT.cxx 2006/10/02 13:05:39 1.18 @@ -2,7 +2,7 @@ * FTrkQLook_EXPERT.cxx * * autor: D.Fedele - * version v1r12 + * version v1r14 * Parameters: * file - the data file to analyze * fromevent - first event to analyze @@ -161,7 +161,6 @@ countnboot+=(Int_t)(2*nevent/MAXSTORAGE); // printf("\ncountnboot=%d\n",countnboot); - // // other variables definitions stringstream oss1,oss2,oss3,oss4,fromfile,isfile,tit; @@ -367,6 +366,7 @@ Int_t minev=minevent,maxev=maxevent,countTEMP=0,countMAG=0; + ULong_t countALARMx=0,countALARMy=0; // // Fill temperature graphs @@ -783,14 +783,22 @@ WARNING[i] = 1; // DSP warning }; - if(te->alarm[i]!=0){ // hardware alarm - ALARM = 1; + if(dsp%2==0 && te->alarm[i]!=0){ // hardware alarm + if(countALARMy==0) + ALARM = 1; + countALARMy+=1; + }; + + if(dsp%2==1 && te->alarm[i]!=0){ // hardware alarm + if(countALARMx==0) + ALARM = 1; + countALARMx+=1; }; //************************************************************************************** // warning for internal number //************************************************************************************** - if(i<=10 && te->eventn[i]!=te->eventn[i+1]) ALARM=1; + if(ev==minev && i<=10 && te->eventn[i]!=te->eventn[i+1]) ALARM=1; if((ev-minev)>=1 && eventn[i]+1!=te->eventn[i] && te->eventn[i]!=1) ALARM=1; } eventint[(ev-minev)]=te->eventn[0]; @@ -844,6 +852,16 @@ } } if(al==0) alarm << endl<< "Page "< NO ALARM!!! <-------"<GetMaximum(); + b.SetFillColor(107); + b.SetFillStyle(3954); + b.DrawBox(256.,0.,384.,maxhist); + } else if(i==11){ maxhist= illuminazione[i]->GetMaximum(); b.SetFillColor(6);