--- quicklook/OrbitalRate/src/OrbitalRate.cpp 2006/12/06 15:52:13 1.2 +++ quicklook/OrbitalRate/src/OrbitalRate.cpp 2006/12/06 16:25:52 1.3 @@ -478,7 +478,7 @@ if (deltaTime > 1) cout << endl << "******** deltaTime<1 ********" << endl; // Does nothing for the first two events or if acquisition time if more // than 1s. - if(i<2 || (deltaTime > 1)) continue; + if(i<1 || (deltaTime > 1)) continue; // CAS3 and CAS4 are not rates but only counters. So I fill // with the bin with the difference beetween the actual counter @@ -591,19 +591,19 @@ trigS111A_rate->Divide(trigS111A_counter, obtBinTime, 1, 1, ""); oss.str(""); oss << basename.Data() << "_orbit_trigS111A.png"; - trigS111A_rate->SetMinimum(10); + trigS111A_rate->SetMinimum(9); printHist(trigS111A_rate, mapFile, outDirectory, oss.str().c_str(), "S111A (Hz)", -width, height, true, 0); antiCAS4_rate->Divide(antiCAS4_counter, obtBinTime, 1, 1, ""); oss.str(""); oss << basename.Data() << "_orbit_CAS4.png"; - antiCAS4_rate->SetMinimum(100); + antiCAS4_rate->SetMinimum(99); printHist(antiCAS4_rate, mapFile, outDirectory, oss.str().c_str(), "CAS4 (Hz)", -width, height, true, 0); antiCAS3_rate->Divide(antiCAS3_counter, obtBinTime, 1, 1, ""); oss.str(""); oss << basename.Data() << "_orbit_CAS3.png"; - antiCAS3_rate->SetMinimum(100); + antiCAS3_rate->SetMinimum(99); printHist(antiCAS3_rate, mapFile, outDirectory, oss.str().c_str(), "CAS3 (Hz)", -width, height, true, 0); event_rate->Divide(event_counter, obtBinTime, 1, 1, ""); @@ -614,13 +614,13 @@ trigS11andS12_rate->Divide(trigS11andS12_counter, obtBinTime, 1, 1, ""); oss.str(""); oss << basename.Data() << "_orbit_trigS11andS12.png"; - antiCAS3_rate->SetMinimum(100); + trigS11andS12_rate->SetMinimum(99); printHist(trigS11andS12_rate, mapFile, outDirectory, oss.str().c_str(), "(S11*S12) (Hz)", -width, height, 1, 0); trigS12andS21andS22_rate->Divide(trigS12andS21andS22_counter, obtBinTime, 1, 1, ""); oss.str(""); oss << basename.Data() << "_orbit_trigS12andS21andS22.png"; - antiCAS3_rate->SetMinimum(10); + trigS12andS21andS22_rate->SetMinimum(9); printHist(trigS12andS21andS22_rate, mapFile, outDirectory, oss.str().c_str(), "(S12*S12*S21) (Hz)", -width, height, true, 0); trigAndOr_rate->Divide(trigAndOr_counter, obtBinTime, 1, 1, ""); @@ -737,11 +737,9 @@ // Create a canvas and draw the TH2F with a nice colormap for z // values, using log scale for z values, if requested, and setting // some title. - TCanvas *canvas = new TCanvas("h", "passed histogram", width*2, height*2); + TCanvas *canvas = new TCanvas("h", "h histogram", width*2, height*2); - if(use_log) { - canvas->SetLogz(); - } + if(use_log) canvas->SetLogz(); h->SetTitle(title); h->SetXTitle("Longitude (deg)");