Changeset 2152 for trunk/MagicSoft/Mars

Timestamp:

06/03/03 08:21:45 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/ONOFFCT1Analysis.C (added)
• manalysis/AnalysisLinkDef.h (modified) (2 diffs)
• manalysis/MPadONOFF.cc (added)
• manalysis/MPadONOFF.h (added)
• manalysis/MPadSchweizer.cc (modified) (3 diffs)
• manalysis/Makefile (modified) (2 diffs)
• mfileio/MCT1ReadPreProc.cc (modified) (5 diffs)
• mfileio/MCT1ReadPreProc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/03: Wolfgang Wittek
+
+   * mfileio/MCT1ReadPreProc.[h,cc]
+     - reset blind pixels for each event
+       (because they may have been changed by the padding)
+
+   * macros/ONOFFCT1Analysis.C
+     - will be the macro for the CT1 analysis using ON and OFF data
+
+   * manalysis/MPadONOFF.[h,cc]
+     - new class
+     - class for the padding of ON/OFF data
+
+   * manalysis/MPadSchweizer.[h,cc]
+     - remove fBlinds->Clear() because the resetting of the
+       blind pixels is now done in MCT1ReadPreProc
+
+
+
  2003/06/02: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -41 +41 @@
 #pragma link C++ class MPadding+;
 #pragma link C++ class MPadSchweizer+;
+#pragma link C++ class MPadONOFF+;
 
 #pragma link C++ class MCT1PointingCorrCalc+;
@@ -54 +55 @@
 
 #endif
+

trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc

@@ -392 +392 @@
 
   hblind = fHBlindPixIdTheta->ProjectionY("", binPix, binPix, "");
-  fBlinds->Clear();
   if ( hblind->GetEntries() > 0.0 )
     for (UInt_t i=0; i<numBlind; i++)
@@ -774 +773 @@
 
     //---------------------------------------------------------------
-    TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 900)); 
-    c.Divide(3, 3);
+    TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 1200)); 
+    c.Divide(3, 4);
     gROOT->SetSelectedPad(NULL);
 
@@ -801 +800 @@
     fHSigmaTheta->DrawCopy();     
     fHSigmaTheta->SetBit(kCanDelete);     
+
+    //--------------------------------------------------------------------
+
+
+    c.cd(7);
+    fHBlindPixNTheta->SetDirectory(NULL);
+    fHBlindPixNTheta->SetTitle("(Input) 2D : no.of blind pixels, \\Theta");
+    fHBlindPixNTheta->DrawCopy();     
+    fHBlindPixNTheta->SetBit(kCanDelete);     
+
+    //--------------------------------------------------------------------
+
+
+    c.cd(10);
+    fHBlindPixIdTheta->SetDirectory(NULL);
+    fHBlindPixIdTheta->SetTitle("(Input) 2D : blind pixel Id, \\Theta");
+    fHBlindPixIdTheta->DrawCopy();     
+    fHBlindPixIdTheta->SetBit(kCanDelete);     
 
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
-           -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc
+           -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc \
+           -I../mfileio
+
 
 #------------------------------------------------------------------------------
@@ -54 +56 @@
            MPadding.cc \
            MPadSchweizer.cc \
+           MPadONOFF.cc \
            MCT1PointingCorrCalc.cc \
            MParameters.cc \

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -234 +234 @@
 
     // Boolean bdontusepix[iMAXNUMPIX]; // bdontusepix is set true if the pixel should not be used in image analysis, otherwise it is true;
+
     fBlinds->Clear();
     *fLog << "Don't use pixels: ";
@@ -245 +246 @@
 
     *fLog << "Exclude pixels: ";
-
     // Boolean bexcludepix[iMAXNUMPIX];
     for (int i=0; i<iMAXNUMPIX; i++)
@@ -254 +254 @@
         }
     *fLog << endl;
+
+    // save blind pixels for all events of this run
+    fBlnd.Set(iMAXNUMPIX);
+    for (int i=0; i<iMAXNUMPIX; i++)
+    {
+        if ( fBlinds->IsBlind(i) )
+        {
+          fBlnd[i] = 1;
+        }
+        else
+        {
+          fBlnd[i] = 0;
+        }
+    }
 
     fBlinds->SetReadyToSave();
@@ -881 +895 @@
     */
 
+    // reset blind pixels for this event
+    fBlinds->Clear();
+    for (int i=0; i<iMAXNUMPIX; i++)
+        if ( fBlnd[i]==1 )
+        {
+            fBlinds->SetPixelBlind(i);
+        }
+
+    // reset pedestal RMS for this event
     for (Int_t i=0; i<iMAXNUMPIX; i++)
         (*fPedest)[i].SetMeanRms(fPedRMS[i]);
@@ -1108 +1131 @@
     struct eventrecord event;
 
+
+
     // read the eventrecord from the file
     fIn->read((Byte_t*)&event, sizeof(struct eventrecord));

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -4 +4 @@
 #ifndef ROOT_TArrayF
 #include <TArrayF.h>
+#endif
+
+#ifndef ROOT_TArrayI
+#include <TArrayI.h>
 #endif
 
@@ -58 +62 @@
 
     TArrayF fPedRMS;
+    TArrayI fBlnd;
 
     Bool_t OpenNextFile();