Changeset 13855 for fact

Timestamp:

05/24/12 02:24:59 (13 years ago)

Author:

Jens Buss

Message:

modification of verbosity output

File:

• fact/tools/rootmacros/PulseTemplates/pixel.C (modified) (9 diffs)

fact/tools/rootmacros/PulseTemplates/pixel.C

@@ -20 +20 @@
         float       bSLMean,
         float       gainMean,
-        TFile*      filename
+        TFile*      filename,
+        TFile*      outfilename
         )
 {
@@ -35 +36 @@
     mGainMean               = gainMean;
     mRootFile               = filename;
+    mOutRootFile            = outfilename;
 
     hMaxOverlay  = new TH2F*[mMaxPulseOrder];
@@ -165 +167 @@
         pixelCanvas[pulse_order]->cd( histoFrameNr[2] );
         hMaxProfile[pulse_order]->Draw();
-        hEdgeProfile[pulse_order]->Draw("SAME");
 
         pixelCanvas[pulse_order]->cd( histoFrameNr[1] );
         hEdgeOverlay[pulse_order]->Draw("COLZ");
+        pixelCanvas[pulse_order]->cd( histoFrameNr[3] );
+        hEdgeProfile[pulse_order]->Draw();
     }
 }
@@ -265 +268 @@
 void
 Pixel::SavePixelHistograms(
-        TString outRootFileName,
+        TString     outRootFileName,
         bool        saveResults
         )
@@ -281 +284 @@
 // end of SavePixelHistograms
 //----------------------------------------------------------------------------
-
-
 
 TString
@@ -683 +684 @@
 Pixel::LoadPulseHistos()
 {
-    if (mVerbosityLevel > 1)
-    {
-        mRootFile->ls();
-        cout << "Current File: " ;
+    mRootFile->cd();
+
+    if (mVerbosityLevel > 2)
+    {
+        if (mVerbosityLevel > 3)
+        {
+            mRootFile->ls();
+        }
+        cout << "loading current File: " ;
         gFile->pwd();
     }
@@ -693 +699 @@
     mDirectory = gDirectory;
 
-    if (mVerbosityLevel > 1)
-    {
+    if (mVerbosityLevel > 2)
+    {
+        if (mVerbosityLevel > 3)
+        {
+            gDirectory->ls();
+        }
         cout << "Current Directory: " ;
-        gDirectory->ls();
+        gDirectory->pwd();
     }
 
@@ -717 +727 @@
         if (mVerbosityLevel > 3) cout << "\t...loading " << HistoName("hMaxProfile", order) << endl;
         hMaxProfile[order]  = (TProfile*)mDirectory->Get( ChooseCycleNumber( HistoName("hMaxProfile", order), 1) );
-        cout << "histoname: " << HistoName("hMaxProfile", order)
-             << "histoname: " << ChooseCycleNumber( HistoName("hMaxProfile", order), 1)
-             << "histoname: " << hMaxProfile[order];
+
         if (mVerbosityLevel > 3) cout << "\t...loading " << HistoName("hEdgeProfile", order) << endl;
         hEdgeProfile[order] = (TProfile*)mDirectory->Get( ChooseCycleNumber( HistoName("hEdgeProfile", order), 1) );
@@ -912 +920 @@
         if (mVerbosityLevel > 3)
         cout << endl << "\t\t...deleting hPixelEdgeMax"
-                                      << mChid << "_" << order
-                                      << " hPixelEdgeMax[order] adr " << hPixelEdgeMax[order]
-                                      << " hPixelEdgeMax adr " << hPixelEdgeMax
-                                         ;
+                                      << mChid << "_" << order;
 
         delete hPixelEdgeMax[order];