--- PamelaLevel2/src/PamLevel2.cpp 2008/10/01 16:06:19 1.64 +++ PamelaLevel2/src/PamLevel2.cpp 2008/11/06 10:45:36 1.65 @@ -722,7 +722,7 @@ Bool_t PamLevel2::IsGood(){ Bool_t goodev=true; - // if(trk2_obj && trk2_obj->UnpackError() != 0 ) goodev = false; + if(trk2_obj && trk2_obj->UnpackError() != 0 ) goodev = false; if(calo2_obj && calo2_obj->good != 1) goodev = false; if(tof_obj && tof_obj->unpackError != 0) goodev = false; if(trig_obj && trig_obj->unpackError != 0) goodev = false; @@ -756,7 +756,10 @@ return &trk2_obj; }; if(!objname.CompareTo("TrkHough")) { - if(!trkh_obj) trkh_obj = new TrkHough(); + if(!trkh_obj) { + trkh_obj = new TrkHough(); + trkh_obj->Set(); + } return &trkh_obj; }; if(!objname.CompareTo("CaloLevel1")) { @@ -2737,7 +2740,15 @@ // -------------------------------------- // ---> exit with TRUE // -------------------------------------- - cout << endl << " ))))) UPDATE RUN INFO ((((( @iev "<ID<<" irun "<ID<<" irun "<IsConnected()) )SetDBConnection(); + TrkParams::Set(GetRunInfo() ,dbc); + if(dbc)dbc->Close(); + // ---------------------------------------------------- // then check if the run has a fragment // in this case we have to switch to the next fragment @@ -2746,6 +2757,7 @@ if( GetRunInfo()->ID_RUN_FRAG != 0 && // GetRunInfo()->ID_RUN_FRAG != GetRunInfo()->ID && + DBG && true ){ cout << "* fragment *"<> "<RUNHEADER_OBT<<" "<RUNTRAILER_OBT; cout << " *** JUMP RUN *** irun "<> "<RUNHEADER_OBT<<" "<RUNTRAILER_OBT; } - cout << endl; - cout << endl << " ))))) UPDATE RUN INFO ((((( @iev "<ID<<" (run-entry "<ID<<" (run-entry "<IsConnected()) )SetDBConnection(); + TrkParams::Set(GetRunInfo() ,dbc); + if(dbc)dbc->Close(); // cout << endl; prevshift = 0; return true; @@ -3897,17 +3914,17 @@ // } if ( TRK0 ){ - TrkParams::Load(6); - if( !TrkParams::IsLoaded(6) ){ - cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<IsConnected()))SetDBConnection(); +// TrkParams::Load(6); +// if( !TrkParams::IsLoaded(6) ){ +// cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<IsConnected()))SetDBConnection(); TrkParams::SetCalib(run_obj,dbc); TrkParams::LoadCalib( ); if( !TrkParams::CalibIsLoaded() ){ cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- Calibration not loaded"<Close(); // EMILIANO, do not leave open connections, open only when needed +// if(dbc)dbc->Close(); // EMILIANO, do not leave open connections, open only when needed } @@ -3976,8 +3993,8 @@ do{ if(shift>0){ cout << " PKTNUM L2 --- "<< pktn << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<ID << " ID_ROOT_L0 "<ID_ROOT_L0<<" ID_RUN_FRAG "<ID_RUN_FRAG << " EV_FROM "<EV_FROM < L0 mismatch ( irun "<ID << " ID_ROOT_L0 "<ID_ROOT_L0<<" ID_RUN_FRAG "<ID_RUN_FRAG << " EV_FROM "<EV_FROM < L0 mismatch ( irun "<GetEntry(quellagiusta+(Long64_t)shift+(Long64_t)prevshift); shift++; @@ -4025,6 +4042,7 @@ */ Bool_t PamLevel2::SetDBConnection(){ +// cout << "PamLevel2::SetDBConnection()" << endl; if(DBG){ cout<<"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<