X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=TRD%2FAliTRDCalibChamberStatus.cxx;h=02d1de785d4657b2ad9d0432bbe7857528451e9d;hb=3333be857051cffe1560a847128e7dee4f5337c0;hp=44427e7fcccbb14e2379519422719e5a69da8f8f;hpb=4bd7dd5f010e73fa7387e0e85e9f3b2f29b368a9;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDCalibChamberStatus.cxx b/TRD/AliTRDCalibChamberStatus.cxx index 44427e7fccc..02d1de785d4 100644 --- a/TRD/AliTRDCalibChamberStatus.cxx +++ b/TRD/AliTRDCalibChamberStatus.cxx @@ -266,7 +266,7 @@ void AliTRDCalibChamberStatus::Init() } //_____________________________________________________________________ -void AliTRDCalibChamberStatus::ProcessTrack(AliTRDtrackV1 * trdTrack) +void AliTRDCalibChamberStatus::ProcessTrack(const AliTRDtrackV1 * trdTrack) { // // Track Processing to get half chamber status @@ -303,7 +303,7 @@ void AliTRDCalibChamberStatus::ProcessTrack(AliTRDtrackV1 * trdTrack) Double_t rphi = 0.5; if(iMcm > 3) rphi = 1.5; - Double_t val[4] = {sm,layer,stac,rphi}; + Double_t val[4] = {static_cast(sm),static_cast(layer),static_cast(stac),static_cast(rphi)}; if(fHnSparseI->GetBinContent((const Int_t*)val)<2147483646) fHnSparseI->Fill(&val[0]); } @@ -355,7 +355,7 @@ void AliTRDCalibChamberStatus::ProcessEvent(AliRawReader * rawReader, Int_t neve Double_t rphi = 0.5; if(iMcm > 3) rphi = 1.5; - Double_t val[4] = {sm,layer,stac,rphi}; + Double_t val[4] = {static_cast(sm),static_cast(layer),static_cast(stac),static_cast(rphi)}; fHnSparseI->Fill(&val[0]); notEmpty = kTRUE; @@ -363,7 +363,7 @@ void AliTRDCalibChamberStatus::ProcessEvent(AliRawReader * rawReader, Int_t neve // Debug // if(fDebugLevel > 0) { Int_t detector = AliTRDgeometry::GetDetector(layer,stac,sm); - Double_t valu[3] = {nevents_physics,detector,rphi}; + Double_t valu[3] = {static_cast(nevents_physics),static_cast(detector),rphi}; fHnSparseEvtDet->Fill(&valu[0]); } // Debug // @@ -398,7 +398,7 @@ Bool_t AliTRDCalibChamberStatus::TestEventHisto(Int_t nevent) /*FOLD00*/ for (Int_t icol=0; icol 72) side = 1; - Double_t val[4] = {ism,ipl,istack,side}; + Double_t val[4] = {static_cast(ism),static_cast(ipl),static_cast(istack),static_cast(side)}; fHnSparseI->Fill(&val[0]); } } @@ -410,7 +410,7 @@ Bool_t AliTRDCalibChamberStatus::TestEventHisto(Int_t nevent) /*FOLD00*/ } //_____________________________________________________________________ -void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ +void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit, Double_t chamberlimit) /*FOLD00*/ { // // Create the AliTRDCalChamberStatus according to the fHnSparseI @@ -419,6 +419,8 @@ void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ if(fCalChamberStatus) delete fCalChamberStatus; fCalChamberStatus = new AliTRDCalChamberStatus(); + //printf("test0\n"); + // Check if enough events/tracklets per halfchamber to say something Double_t mean=0.0; //number of tracklets per HCS Int_t coord2[4]; @@ -426,8 +428,8 @@ void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ //if(fHnSparseI->GetBinContent(bin,coord2)==0.0) printf(" bin shouldnt be empty!!\n"); mean+=fHnSparseI->GetBinContent(bin,coord2); } - mean/=fHnSparseI->GetNbins(); - //printf(" mean tracklets per halfchamber %f \n",mean); + if(fHnSparseI->GetNbins() > 0.0) mean/=fHnSparseI->GetNbins(); + //printf(" mean tracklets per halfchamber %.3e \n",mean); if((fCounterEventNotEmpty < limit) && (mean < limit)) { // Say all good for (Int_t idet=0; idet<540; idet++) { @@ -436,6 +438,8 @@ void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ return; } + //printf("test1\n"); + // set all chambers to NoData for (Int_t idet=0; idet<540; idet++) { fCalChamberStatus->SetStatus(idet,AliTRDCalChamberStatus::kNoData); @@ -445,12 +449,15 @@ void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ Int_t coord[4]; for(Int_t bin = 0; bin < fHnSparseI->GetNbins(); bin++) { - //Double_t content = fHnSparseI->GetBinContent(bin,coord); - fHnSparseI->GetBinContent(bin,coord); - // layer, stack, sector + Double_t content = fHnSparseI->GetBinContent(bin,coord); + + // layer, stack, sector Int_t detector = AliTRDgeometry::GetDetector(coord[1]-1,coord[2]-1,coord[0]-1); - // - //printf("Number of entries for detector %d: %f\n",detector,content); + + if(content %.3f \n",detector,(coord[3]-1==0?"A":"B"),content,content/mean); + continue; + } // // Check which halfchamber side corresponds to the bin number (0=A, 1=B) // Change the status accordingly @@ -475,7 +482,7 @@ void AliTRDCalibChamberStatus::AnalyseHisto(Int_t limit) /*FOLD00*/ } //_____________________________________________________________________ -void AliTRDCalibChamberStatus::CheckEORStatus(AliTRDCalDCSv2 *calDCS) /*FOLD00*/ +void AliTRDCalibChamberStatus::CheckEORStatus(const AliTRDCalDCSv2 *calDCS) /*FOLD00*/ { // // Correct the AliTRDCalChamberStatus according to the AliTRDCalDCSv2 @@ -530,14 +537,14 @@ void AliTRDCalibChamberStatus::CheckEORStatus(AliTRDCalDCSv2 *calDCS) /*FOLD00*/ ((fCalChamberStatus->GetStatus(det) == 4) && (stateB==0 || stateB==1)) ) { //printf(" Different half chamber status in DCS and DATA!!\n"); - Double_t val[4] = {sm,lay,stac,1}; + Double_t val[4] = {static_cast(sm),static_cast(lay),static_cast(stac),1}; fHnSparseDebug->Fill(&val[0]); // Fill MCM status map for(Int_t ii = 0; ii < 8; ii++) { //ROB loop for(Int_t i = 0; i < 18; i++) { //MCM loop - Double_t valss[6] = {sm,lay,stac,ii,i - ,calDCSFEEEOR->GetMCMGlobalState(ii,i)}; + Double_t valss[6] = {static_cast(sm),static_cast(lay),static_cast(stac),static_cast(ii),static_cast(i) + ,static_cast(calDCSFEEEOR->GetMCMGlobalState(ii,i))}; fHnSparseMCM->Fill(&valss[0]); } @@ -550,8 +557,8 @@ void AliTRDCalibChamberStatus::CheckEORStatus(AliTRDCalDCSv2 *calDCS) /*FOLD00*/ //--------------------------------------- // Change the status according to DCS //--------------------------------------- - Int_t StatusData = fCalChamberStatus->GetStatus(det); - switch(StatusData) + Int_t statusData = fCalChamberStatus->GetStatus(det); + switch(statusData) { case 1: if(stateA==0 && stateB==0) fCalChamberStatus->SetStatus(det,2); // completely masked from DCS @@ -581,7 +588,7 @@ void AliTRDCalibChamberStatus::CheckEORStatus(AliTRDCalDCSv2 *calDCS) /*FOLD00*/ } //_____________________________________________________________________________________ -void AliTRDCalibChamberStatus::Add(AliTRDCalibChamberStatus *calibChamberStatus) /*FOLD00*/ +void AliTRDCalibChamberStatus::Add(const AliTRDCalibChamberStatus *calibChamberStatus) /*FOLD00*/ { // // Add the THnSparseI of this calibChamberStatus @@ -647,7 +654,7 @@ TH2D* AliTRDCalibChamberStatus::PlotSparseI(Int_t sm,Int_t side) } //_____________________________________________________________________ -TH2F *AliTRDCalibChamberStatus::MakeHisto2DSmPlEORStatus(AliTRDCalDCSv2 *calDCS, Int_t sm, Int_t pl) /*FOLD00*/ +TH2F *AliTRDCalibChamberStatus::MakeHisto2DSmPlEORStatus(const AliTRDCalDCSv2 *calDCS, Int_t sm, Int_t pl) /*FOLD00*/ { // // Plot globale state of the HalfChamberMerger (HCM)