Changeset 3255
- Timestamp:
- 02/21/04 02:09:39 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r3254 r3255 35 35 * mcalib/Makefile 36 36 * mcalib/CalibLinkDef.h 37 * macros/calibration.C 38 * macros/bootcampstandardanalysis.C 39 * macros/pedphotcalc.C 37 40 38 41 - replace MCalibrationCam by MCalibrationChargeCam 42 - replace MCalibrationCalc by MCalibrationChargeCalc 39 43 40 44 -
trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C
r3202 r3255 114 114 // 115 115 116 MCalibrationC amcalcam;116 MCalibrationChargeCam calcam; 117 117 MExtractedSignalCam sigcam; 118 MCalibrationChargePINDiode pindiode; 118 119 120 // 121 // As long, as we don't have digital modules, 122 // we have to set the color of the pulser LED by hand 123 // 124 calcam.SetColor(MCalibrationChargeCam::kECT1); 125 pindiode.SetColor(MCalibrationChargePINDiode::kECT1); 126 119 127 plist2.AddToList(&geomcam); 120 128 plist2.AddToList(&pedcam); 121 129 plist2.AddToList(&calcam); 122 130 plist2.AddToList(&sigcam); 131 plist2.AddToList(&pindiode); 132 133 // hists 134 MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode"); 123 135 124 136 //tasks … … 126 138 read2.DisableAutoScheme(); 127 139 128 MExtractPINDiode pincalc; 129 MExtractBlindPixel blindcalc; 130 MExtractSignal sigsig; 131 MCalibrationCalc calcalc; 132 133 MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode"); 134 // 135 // As long, as we don't have digital modules, 136 // we have to set the color of the pulser LED by hand 137 // 138 calcalc.SetPulserColor(MCalibrationCalc::kECT1); 140 MExtractPINDiode pincalc; 141 MExtractBlindPixel blindcalc; 142 MExtractSignal sigsig; 143 MCalibrationChargeCalc calcalc; 139 144 140 145 // … … 156 161 tlist2.AddToList(&cont); 157 162 // 163 tlist2.AddToList(&fillpin); 158 164 tlist2.AddToList(&calcalc); 159 tlist2.AddToList(&fillpin);160 165 // 161 166 // Create and setup the eventloop -
trunk/MagicSoft/Mars/macros/calibration.C
r3234 r3255 23 23 \* ======================================================================== */ 24 24 25 const TString pedfile = "../20040215_16770_P_OffCrab4_E.root"; 26 const TString calfile = "../20040215_16771_C_OffCrab4_E.root"; 27 25 28 //const TString pedfile = "/mnt/users/mdoro/Mars/Data/20040201_14418_P_OffMrk421-1_E.root"; 26 29 //const TString calfile = "/mnt/users/mdoro/Mars/Data/20040201_1441*_C_OffMrk421-1_E.root"; 27 30 28 const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14607_P_CrabNebula_E.root";29 const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14608_C_CrabNebula_E.root";31 //const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14607_P_CrabNebula_E.root"; 32 //const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14608_C_CrabNebula_E.root"; 30 33 31 34 //const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_01_26/20040125_10412_P_Crab-On_E.root"; … … 43 46 44 47 MStatusDisplay *display = new MStatusDisplay; 45 display->SetUpdateTime( 3000);48 display->SetUpdateTime(500); 46 49 display->Resize(850,700); 47 50 … … 110 113 // Look at one specific pixel, after all the histogram manipulations: 111 114 // 112 hpedcam[9].DrawClone("fourier ");115 hpedcam[9].DrawClone("fourierevents"); 113 116 114 117 … … 218 221 219 222 MExtractedSignalCam sigcam; 220 MCalibrationC amcalcam;223 MCalibrationChargeCam calcam; 221 224 MHCalibrationRelTimeCam timecam; 222 225 // … … 244 247 // thus take the sliding window 245 248 // 246 MExtractPINDiode pincalc;247 MExtractBlindPixel blindcalc;248 MExtractSignal2 sigcalc2;249 MArrivalTimeCalc2 timecalc;250 MCalibrationC alccalcalc;249 MExtractPINDiode pincalc; 250 MExtractBlindPixel blindcalc; 251 MExtractSignal2 sigcalc2; 252 MArrivalTimeCalc2 timecalc; 253 MCalibrationChargeCalc calcalc; 251 254 252 255 MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime"); … … 274 277 // we have to set the color of the pulser LED by hand 275 278 // 276 calcalc.SetPulserColor(MCalibrationCalc::kECT1);279 // calcalc.SetPulserColor(MCalibrationCalc::kECT1); 277 280 278 281 // … … 338 341 // print the most important results of all pixels 339 342 // 340 //calcam.Print();343 calcam.Print(); 341 344 342 345 // 343 346 // just one example how to get the plots of individual pixels 344 347 // 345 // calcam[563].DrawClone(); 346 // calcam[564].DrawClone(); 348 calcam[564].DrawClone(); 347 349 348 350 // Create histograms to display … … 559 561 CamDraw(c9,disp21,calcam,2,2,2); 560 562 561 562 563 // Rel. Times 563 564 TCanvas &c10 = display->AddTab("Fitted Rel. Times"); … … 581 582 CamDraw(c12,disp27,calcam,1,2,2); 582 583 CamDraw(c12,disp28,calcam,2,2,2); 583 584 584 } 585 585 … … 603 603 TH1D *obj2 = (TH1D*)obj1->Projection(); 604 604 605 obj2->Sumw2(); 605 606 obj2->Draw(); 606 607 obj2->SetBit(kCanDelete); 607 608 608 609 609 const Double_t min = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst()); -
trunk/MagicSoft/Mars/macros/pedphotcalc.C
r3203 r3255 34 34 #include "MGeomCamMagic.h" 35 35 #include "MEvtLoop.h" 36 #include "MCalibrationC am.h"36 #include "MCalibrationChargeCam.h" 37 37 #include "MExtractedSignalCam.h" 38 38 #include "MExtractSignal.h" 39 #include "MCalibrationC alc.h"39 #include "MCalibrationChargeCalc.h" 40 40 #include "MCerPhotEvt.h" 41 41 #include "MCalibrate.h" … … 109 109 110 110 // containers 111 MCalibrationC amcalcam;112 MExtractedSignalCam sigcam;111 MCalibrationChargeCam calcam; 112 MExtractedSignalCam sigcam; 113 113 114 114 plist2.AddToList(&geomcam); … … 121 121 read2.DisableAutoScheme(); 122 122 123 MExtractPINDiode pincalc;124 MExtractBlindPixel blindcalc;125 MExtractSignal sigcalc;126 MCalibrationC alccalcalc;123 MExtractPINDiode pincalc; 124 MExtractBlindPixel blindcalc; 125 MExtractSignal sigcalc; 126 MCalibrationChargeCalc calcalc; 127 127 128 128 MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode"); 129 129 // 130 130 // Apply a filter against cosmics 131 // (was directly in MCalibrationC alc in earlier versions)131 // (was directly in MCalibrationChargeCalc in earlier versions) 132 132 // 133 133 MFCosmics cosmics; 134 134 MContinue cont(&cosmics); 135 135 136 //137 // As long as we don't have digital modules,138 // we have to set the color of the pulser LED by hand139 //140 calcalc.SetPulserColor(MCalibrationCalc::kECT1);141 142 136 tlist2.AddToList(&read2); 143 137 tlist2.AddToList(&geomapl); … … 151 145 tlist2.AddToList(&cont); 152 146 // 147 tlist2.AddToList(&fillpin); 153 148 tlist2.AddToList(&calcalc); 154 tlist2.AddToList(&fillpin);155 149 156 150 // Execute second loop (calibration) -
trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
r3242 r3255 39 39 // MMcFadcHeader 40 40 // MRawRunHeader 41 // [MCalibrationC am] (if it existed previously)41 // [MCalibrationChargeCam] (if it existed previously) 42 42 // 43 43 // Output Containers: 44 44 // MPedPhotCam 45 // [MCalibrationC am] (if it did not exist previously)45 // [MCalibrationChargeCam] (if it did not exist previously) 46 46 // 47 47 ///////////////////////////////////////////////////////////////////////////// … … 54 54 55 55 #include "MCalibrationPix.h" 56 #include "MCalibrationC am.h"56 #include "MCalibrationChargeCam.h" 57 57 #include "MExtractedSignalCam.h" 58 58 #include "MExtractedSignalPix.h" … … 108 108 Int_t MMcCalibrationUpdate::PreProcess(MParList *pList) 109 109 { 110 fCalCam = (MCalibrationC am*) pList->FindObject(AddSerialNumber("MCalibrationCam"));110 fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); 111 111 if ( !fCalCam ) 112 112 { 113 *fLog << inf << dbginf << AddSerialNumber("MCalibrationC am") << " does not exist... Creating." << endl;114 115 fCalCam = (MCalibrationC am*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));113 *fLog << inf << dbginf << AddSerialNumber("MCalibrationChargeCam") << " does not exist... Creating." << endl; 114 115 fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam")); 116 116 if ( !fCalCam ) 117 117 { 118 *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationC am") << "... aborting." << endl;118 *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationChargeCam") << "... aborting." << endl; 119 119 return kFALSE; 120 120 } … … 123 123 { 124 124 fFillCalibrationCam = kFALSE; 125 *fLog << inf << AddSerialNumber("MCalibrationC am") << " already exists... " << endl;125 *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl; 126 126 } 127 127 … … 148 148 // Check for the runtype. 149 149 // Search for MGeomCam and MMcFadcHeader. 150 // Fill the MCalibrationC am object.150 // Fill the MCalibrationChargeCam object. 151 151 // 152 152 Bool_t MMcCalibrationUpdate::ReInit(MParList *pList)
Note:
See TracChangeset
for help on using the changeset viewer.