Changeset 2437 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/28/03 07:33:49 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (3 diffs)
• MCT1PadONOFF.cc (modified) (26 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -42 +42 @@
 
 #pragma link C++ class MCT1PadSchweizer+;
-//#pragma link C++ class MCT1PadONOFF+;
+#pragma link C++ class MCT1PadONOFF+;
 
 #pragma link C++ class MCT1PointingCorrCalc+;
@@ -59 +59 @@
 #pragma link C++ class MMcPedestalRead+;
 
+
 #endif
 
@@ -70 +71 @@
 
 
+
+

trunk/MagicSoft/Mars/manalysis/MCT1PadONOFF.cc

@@ -200 +200 @@
   {
     edgesx[i] = ax->GetBinLowEdge(i+1);
-    //*fLog << "i, theta low edge = " << i << ",  " << edgesx[i] << endl; 
+    // *fLog << "i, theta low edge = " << i << ",  " << edgesx[i] << endl; 
   }
   MBinning binth;
@@ -213 +213 @@
   {
     edgesy[i] = ay->GetBinLowEdge(i+1); 
-    //*fLog << "i, sigmabar low edge = " << i << ",  " << edgesy[i] << endl; 
+    // *fLog << "i, sigmabar low edge = " << i << ",  " << edgesy[i] << endl; 
   }
   MBinning binsg;
@@ -989 +989 @@
 Int_t MCT1PadONOFF::Process()
 {
-  //*fLog << "Entry MCT1PadONOFF::Process();" << endl;
+  // *fLog << "Entry MCT1PadONOFF::Process();" << endl;
 
   //------------------------------------------------
@@ -1014 +1014 @@
       continue;
 
-    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetMeanRms());
+    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetPedestalRms());
   }
 
@@ -1026 +1026 @@
 
   //fSigmabar->Calc(*fCam, *fPed, *fEvt);
-  //*fLog << "before padding : " << endl;
+  // *fLog << "before padding : " << endl;
   //fSigmabar->Print("");
 
@@ -1055 +1055 @@
     if (sigbarold > 0)
     {
-      //*fLog << "MCT1PadONOFF::Process(); sigmabar of event to be padded is > 0 : "
+      // *fLog << "MCT1PadONOFF::Process(); sigmabar of event to be padded is > 0 : "
       //      << sigbarold << ". Stop event loop " << endl;
       // input data should have sigmabar = 0; stop event loop
@@ -1066 +1066 @@
 
   const Double_t theta = kRad2Deg*fMcEvt->GetTelescopeTheta();
-  //*fLog << "theta = " << theta << endl;
+  // *fLog << "theta = " << theta << endl;
 
   Int_t binTheta = fHBlindPixNTheta->GetXaxis()->FindBin(theta);
   if ( binTheta < 1  ||  binTheta > fHBlindPixNTheta->GetNbinsX() )
   {
-    //*fLog << "MCT1PadONOFF::Process(); binNumber out of range : theta, binTheta = "
+    // *fLog << "MCT1PadONOFF::Process(); binNumber out of range : theta, binTheta = "
     //      << theta << ",  " << binTheta << ";  Skip event " << endl;
     // event cannot be padded; skip event
@@ -1095 +1095 @@
     nSigma = hn->GetBinContent(binSigma);
 
-    //*fLog << "Theta, sigbarold, binTheta, binSigma, nTheta, nSigma = "
+    // *fLog << "Theta, sigbarold, binTheta, binSigma, nTheta, nSigma = "
     //      << theta << ",  " << sigbarold << ",  " << binTheta << ",  "
     //      << binSigma << ",  " << nTheta << ",  " << nSigma   << endl;      
@@ -1111 +1111 @@
     nSigma = hn->GetBinContent(binSigma);
 
-    //*fLog << "Theta, sigbarold, binTheta, binSigma, nTheta, nSigma = "
+    // *fLog << "Theta, sigbarold, binTheta, binSigma, nTheta, nSigma = "
     //      << theta << ",  " << sigbarold << ",  " << binTheta << ",  "
     //      << binSigma << ",  " << nTheta << ",  " << nSigma   << endl;      
@@ -1141 +1141 @@
   if ( nblind->Integral() == 0.0 )
   {
-    //*fLog << "MCT1PadONOFF::Process(); projection for Theta bin " 
+    // *fLog << "MCT1PadONOFF::Process(); projection for Theta bin " 
     //      << binTheta << " has no entries; Skip event " << endl;
     // event cannot be padded; skip event
@@ -1156 +1156 @@
   delete nblind;
 
-#warn Code commented out due no compilation errors on Alpha OSF (tgb)
-/*
+  //warn Code commented out due no compilation errors on Alpha OSF (tgb)
+
   // throw the Id of numBlind different pixels in this event
   TH1D *hblind;
@@ -1185 +1185 @@
 
       fBlinds->SetPixelBlind(idBlind);
-      //*fLog << "idBlind = " << idBlind << endl;
+      // *fLog << "idBlind = " << idBlind << endl;
     }
   fBlinds->SetReadyToSave();
@@ -1192 +1192 @@
 
   }
-*/
+
   //******************************************************************
   // has the event to be padded ?
@@ -1199 +1199 @@
 
   Int_t binSig = fHgON->GetYaxis()->FindBin(sigbarold);
-  //*fLog << "binSig, sigbarold = " << binSig << ",  " << sigbarold << endl;
+  // *fLog << "binSig, sigbarold = " << binSig << ",  " << sigbarold << endl;
 
   Double_t prob;
@@ -1219 +1219 @@
       prob = 0.0;
 
-    //*fLog << "nTheta, nSigma, prob = " << nTheta << ",  " << nSigma 
+    // *fLog << "nTheta, nSigma, prob = " << nTheta << ",  " << nSigma 
     //      << ",  " << prob << endl;
   }
@@ -1238 +1238 @@
     delete hpad;
     // event should not be padded
-    //*fLog << "event is not padded" << endl;
+    // *fLog << "event is not padded" << endl;
 
     rc = 8;
@@ -1245 +1245 @@
   }
   // event should be padded
-  //*fLog << "event is padded" << endl;  
+  // *fLog << "event is padded" << endl;  
 
 
@@ -1266 +1266 @@
     sigmabar = hpad->GetRandom();
 
-    //*fLog << "sigmabar = " << sigmabar << endl;
+    // *fLog << "sigmabar = " << sigmabar << endl;
 
     delete hpad;
@@ -1299 +1299 @@
     {
       sigmabar = hsigma->GetRandom();
-       //*fLog << "Theta, bin number = " << theta << ",  " << binTheta  
+       // *fLog << "Theta, bin number = " << theta << ",  " << binTheta  
        //      << ",  sigmabar = " << sigmabar << endl
     }
@@ -1309 +1309 @@
   //-------------------------------------------
 
-  //*fLog << "MCT1PadONOFF::Process(); sigbarold, sigmabar = " 
+  // *fLog << "MCT1PadONOFF::Process(); sigbarold, sigmabar = " 
   //      << sigbarold << ",  "<< sigmabar << endl;
 
@@ -1367 +1367 @@
 
   elNoise2 = TMath::Min(RMS,  sigmabar2 - sigbarold2);
-  //*fLog << "elNoise2 = " << elNoise2 << endl; 
+  // *fLog << "elNoise2 = " << elNoise2 << endl; 
 
   lambdabar = (sigmabar2 - sigbarold2 - elNoise2) / F2excess;     // [photons]
@@ -1405 +1405 @@
 
     MPedestalPix &ppix = (*fPed)[j];
-    Double_t oldsigma = ppix.GetMeanRms();
+    Double_t oldsigma = ppix.GetPedestalRms();
     Double_t oldsigma2 = oldsigma*oldsigma;
 
@@ -1463 +1463 @@
       if (!ok)
       {
-        //*fLog << "theta, j, count, sigmabar, diff = " << theta << ",  " 
+        // *fLog << "theta, j, count, sigmabar, diff = " << theta << ",  " 
         //      << j << ",  " << count << ",  " << sigmabar << ",  " 
         //      << diff << endl;
@@ -1524 +1524 @@
       if (!ok)
       {
-        //*fLog << "theta, j, count, sigmabar, sig = " << theta << ",  " 
+        // *fLog << "theta, j, count, sigmabar, sig = " << theta << ",  " 
         //      << j << ",  " << count << ",  " << sigmabar << ",  " 
         //      << sig << endl;
@@ -1602 +1602 @@
 
     Double_t newsigma = sqrt( oldsigma2 + addSig2 ); 
-    ppix.SetMeanRms( newsigma );
+    ppix.SetPedestalRms( newsigma );
 
     fHSigmaPedestal->Fill( oldsigma, newsigma );
@@ -1611 +1611 @@
 
   //fSigmabar->Calc(*fCam, *fPed, *fEvt);
-  //*fLog << "after padding : " << endl;
+  // *fLog << "after padding : " << endl;
   //fSigmabar->Print("");
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -66 +66 @@
            MMinuitInterface.cc \
            MFiltercutsCalc.cc \
+           MCT1PadONOFF.cc \
            MMcPedestalRead.cc
-#          MCT1PadONOFF.cc \
+
 
 SRCS    = $(SRCFILES)