Changeset 5560 for trunk/MagicSoft/Mars

Timestamp:

12/06/04 12:55:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/RanForest.C (modified) (1 diff)
• mhist/MHCamEvent.cc (modified) (2 diffs)
• mhist/MHCamEvent.h (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
     - fixed bug which I introdued on friday (PostProcess was
       defined twice)
+
+   * macros/RanForest.C:
+     - replaced kGAMMA by MMcEvt::kGAMMA
+
+   * mhist/MHCamEvent.[h,cc]:
+     - allow to set name for MGeomCam
+
+   * mjobs/MJCalibration.cc:
+     - removed some obsolete comments
+     - reset SetNoiseCalculation for both extractors
+     - do not allow 'wrong' time&charge calibration (without
+       extractors cam)
+
 
 

trunk/MagicSoft/Mars/macros/RanForest.C

@@ -38 +38 @@
     tlist.AddToList(&read);
 
-    MFParticleId fgamma("MMcEvt", '=', kGAMMA);
+    MFParticleId fgamma("MMcEvt", '=', MMcEvt::kGAMMA);
     tlist.AddToList(&fgamma);
 
-    MFParticleId fhadrons("MMcEvt", '!', kGAMMA);
+    MFParticleId fhadrons("MMcEvt", '!', MMcEvt::kGAMMA);
     tlist.AddToList(&fhadrons);
 

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -89 +89 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+
+    fNameGeom = "MGeomCam";
 }
 
@@ -150 +152 @@
     }
 
-    MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+    MGeomCam *cam = (MGeomCam*)plist->FindObject(fNameGeom, "MGeomCam");
     if (!cam)
     {
-        *fLog << err << GetDescriptor() << ": No MGeomCam found." << endl;
+        *fLog << err << fNameGeom << " [MGeomCam] not found... abort." << endl;
         return kFALSE;
     }
 
-    // Delete a posible old histogram from a previous loop
+    // Delete a possible old histogram from a previous loop
     if (fSum)
         delete (fSum);

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -18 +18 @@
     MCamEvent *fEvt;       //! the current event
 
-    TString fNameEvt;      // Nameof MCamEvent to fill into histogram
+    TString fNameEvt;      // Name of MCamEvent to fill into histogram
+    TString fNameGeom;     // Name of geometry container
 
     Int_t fType;           // Type to used for calling GetPixelContent
@@ -37 +38 @@
     ~MHCamEvent();
 
-    void SetNameEvt(const TString name) { fNameEvt = name; }
+    void SetNameEvt(const TString name)  { fNameEvt = name; }
+    void SetNameGeom(const TString name) { fNameGeom = name; }
     void SetType(Int_t type) { fType = type; }
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1658 +1658 @@
     fillcam.SetBit(MFillH::kDoNotDisplay);
     filltme.SetBit(MFillH::kDoNotDisplay);
-/*
-
-     fillpin.SetNameTab("PINDiode");
-     fillbnd.SetNameTab("BlindPix");
-     fillcam.SetNameTab("Charge");
-     filltme.SetNameTab("RelTimes");
-
-     TString drawoption;
-
-    if (fDisplayType == kDataCheckDisplay)
-        drawoption += "datacheck";
-    if (fDisplayType == kFullDisplay)
-        drawoption += "all";
-
-    fillcam.SetDrawOption(drawoption.Data());
-    fillbnd.SetDrawOption(drawoption.Data());
-    fillpin.SetDrawOption(drawoption.Data());
-    filltme.SetDrawOption(drawoption.Data());
-  */
+
     //
     // Set default extractors in case, none has been set...
@@ -1695 +1677 @@
         else
         {
-            *fLog << warn;
+            *fLog << err << GetDescriptor() << "ERROR - ";
             *fLog << "Used Extractor derives from MExtractTimeAndCharge, " << endl;
             *fLog << "but MExtractorCam size " << fExtractorCam.GetSize() << " ";
             *fLog << "mismatch pedcam size " << pedcam.GetSize() << "! " << endl;
+            return kFALSE;
         }
     }
 
+    //
+    // Switch off noise calculation
+    //
+    fExtractor->SetNoiseCalculation(kFALSE);
+    fTimeExtractor->SetNoiseCalculation(kFALSE);
+
+    //
+    // Setup more tasks and tasklist
+    //
     MTaskEnv taskenv("ExtractSignal");
     taskenv.SetDefault(fExtractor);