Changeset 2167 for trunk/MagicSoft/Mars

Timestamp:

06/09/03 07:41:40 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/CT1Analysis.C (modified) (1 diff)
• macros/ONOFFCT1Analysis.C (modified) (14 diffs)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MCT1PadONOFF.cc (added)
• manalysis/MCT1PadONOFF.h (added)
• manalysis/MCT1PadSchweizer.cc (added)
• manalysis/MCT1PadSchweizer.h (added)
• manalysis/MPadONOFF.cc (deleted)
• manalysis/MPadONOFF.h (deleted)
• manalysis/MPadSchweizer.cc (deleted)
• manalysis/MPadSchweizer.h (deleted)
• manalysis/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2003/06/09: Wolfgang Wittek
+
+   * macros/CT1Analysis.C
+     - replace MPadSchweizer by MCT1PadSchweizer
+
+   * macros/ONOFFCT1Analysis.C
+     - current version of the macro for the analysis using ON, OFF and MC data
+
+   * manalysis/MPadSchweizer.[h,cc]
+               MPadONOFF.[h,cc]
+     - delete
+
+   * manalysis/MCT1PadSchweizer.[h,cc]
+               MCT1PadONOFF.[h,cc]
+     - add
+
+   * manalysis/Makefile
+               AnalysisLinkdef.h
+     - replace MPadSchweizer and MPadONOFF
+       by MCT1PadSchweizer and MCT1PadONOFF     
+
+
 
  2003/06/06: Robert Wagner

trunk/MagicSoft/Mars/macros/CT1Analysis.C

@@ -633 +633 @@
     //     fPadFlag = 2   get Sigma    from fHSigmaPixTheta
     
-    MPadSchweizer padthomas("MPadSchweizer","Task for the padding (Schweizer)");
+    MCT1PadSchweizer padthomas("MCT1PadSchweizer","Task for the padding (Schweizer)");
     padthomas.SetHistograms(fHSigmaTheta, fHSigmaPixTheta, fHDiffPixTheta,
                             fHIdBlindPixels, fHNBlindPixels);

trunk/MagicSoft/Mars/macros/ONOFFCT1Analysis.C

@@ -282 +282 @@
     //--------------------------------------------------
     // type of data to be padded 
-    //TString typeInput = "ON";
-    TString typeInput = "OFF";
+    TString typeInput = "ON";
+    //TString typeInput = "OFF";
     //TString typeInput = "MC";
     gLog << "typeInput = " << typeInput << endl;
@@ -312 +312 @@
     //                       and merge these histograms
 
-    MPadONOFF pad;
-    pad.SetName("MPadONOFF");
+    MCT1PadONOFF pad;
+    pad.SetName("MCT1PadONOFF");
     pad.SetPadFlag(1);
     pad.SetDataType(typeInput);
@@ -334 +334 @@
       MCT1ReadPreProc readON(fileON);
 
+      MFCT1SelBasic selthetaon;
+      selthetaon.SetCuts(-100.0, 29.5, 35.5);
+      MContinue contthetaon(&selthetaon);
+
       MBlindPixelCalc blindon;
       blindon.SetUseBlindPixels();
@@ -361 +365 @@
     
       tliston.AddToList(&readON);
+      //tliston.AddToList(&contthetaon);
 
       tliston.AddToList(&blindon);
@@ -375 +380 @@
 
       Int_t maxeventson = -1;
-      //Int_t maxeventson = 1000;
+      //Int_t maxeventson = 20000;
       if ( !evtloopon.Eventloop(maxeventson) )
           return;
@@ -403 +408 @@
 
       MCT1ReadPreProc readOFF(fileOFF);
+
+      MFCT1SelBasic selthetaoff;
+      selthetaoff.SetCuts(-100.0, 29.5, 35.5);
+      MContinue contthetaoff(&selthetaoff);
 
       MBlindPixelCalc blindoff;
@@ -434 +443 @@
     
       tlistoff.AddToList(&readOFF);
+      //tlistoff.AddToList(&contthetaoff);
 
       tlistoff.AddToList(&blindoff);
@@ -448 +458 @@
 
       Int_t maxeventsoff = -1;
-      //Int_t maxeventsoff = 1000;
+      //Int_t maxeventsoff = 20000;
       if ( !evtloopoff.Eventloop(maxeventsoff) )
           return;
@@ -471 +481 @@
       gLog << "=====================================================" << endl;
 
-      gLog << "Merge the ON and OFF histograms and define the histograms for the padding :" << endl;
       pad.MergeHistograms(sigthon,     sigthoff,
                           sigpixthon,  sigpixthoff,
@@ -477 +486 @@
                           blindidthon, blindidthoff,
                           blindnthon,  blindnthoff);
-      gLog << "The histograms for the padding have been defined" << endl;
-      gLog << "=====================================================" << endl;
-
-
 
       if (WPad)
@@ -520 +525 @@
     MCT1ReadPreProc read(filenamein);
 
+    MFCT1SelBasic seltheta;
+    seltheta.SetCuts(-100.0, 29.5, 35.5);
+    MContinue conttheta(&seltheta);
+
     if (typeInput ==  "ON")
     {
@@ -526 +535 @@
     }
 
+    MBlindPixelCalc blindbeforepad;
+    blindbeforepad.SetUseBlindPixels();
+    blindbeforepad.SetName("BlindBeforePadding");
+
     MBlindPixelCalc blind;
     blind.SetUseBlindPixels();
+    blind.SetName("BlindAfterPadding");
 
     MFCT1SelBasic selbasic;
@@ -609 +623 @@
     
     tliston.AddToList(&read);
+    //tliston.AddToList(&conttheta);
+
+    tliston.AddToList(&blindbeforepad);
     tliston.AddToList(&pad);
     if (typeInput ==  "ON")
@@ -644 +661 @@
     //  evtloop.Write();
 
-    //Int_t maxevents = -1;
-    Int_t maxevents = 10000;
+    Int_t maxevents = -1;
+    //Int_t maxevents = 1000;
     if ( !evtloop.Eventloop(maxevents) )
         return;

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -39 +39 @@
 #pragma link C++ class MSigmabarParam+;
 
-#pragma link C++ class MPadding+;
-#pragma link C++ class MPadSchweizer+;
-#pragma link C++ class MPadONOFF+;
+#pragma link C++ class MCT1PadSchweizer+;
+#pragma link C++ class MCT1PadONOFF+;
 
 #pragma link C++ class MCT1PointingCorrCalc+;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -54 +54 @@
            MSigmabarParam.cc \
            MSigmabarCalc.cc \
-           MPadding.cc \
-           MPadSchweizer.cc \
-           MPadONOFF.cc \
+           MCT1PadSchweizer.cc \
+           MCT1PadONOFF.cc \
            MCT1PointingCorrCalc.cc \
            MParameters.cc \