Updated version of ModuleCharacterization files

cfg/moduleCharacterization.cfg

@@ -1,19 +1,42 @@
 <Input>
 inputDir /data/TOFPET2/reco/
 fileBaseName run
-runs 2436
+runs 2672
 maxEntries -1
-step1FileName /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_step1_run2436.root
+step1FileName /data/ALIO/plots/moduleCharacterization_step1_run2672.root
+#step1FileName /data/ALIO/plots/moduleCharacterizationCoinNa22_step1_run2634_prova.root
+#step1FileName /home/cmsdaq/guglielmi/Lab5015Analysis/plots/analyzeTOFPET2_wirelessBarInArray_HDR2_UVlaser_tune93_step1_run2652.root
 usePedestals 0
-sourceName Na22
+sourceName Co60
+#sourceName Co60SumPeak
+#sourceName Na22
+#sourceName Na22SingleBar
+#sourceName Laser
+SiPM HDR2
+#SiPM FBK
 </Input>
 
 <Output>
-outFileNameStep1 /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_step1_run2436.root
-outFileNameStep2 /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_step2_run2436.root
-#plotDir /var/www/html/ModuleCharacterization/FBK_thinQuartz/
-#plotDir /var/www/html/ModuleCharacterization/FBK_siliconeResin/
-plotDir /var/www/html/ModuleCharacterization/HPK_HDR2/
+
+outFileNameStep1 /data/ALIO/plots/moduleCharacterization_step1_run2672.root
+outFileNameStep2 /data/ALIO/plots/moduleCharacterization_step2_run2672_provaFit.root
+#outFileNameStep1 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/analyzeTOFPET2_wirelessBarInArray_HDR2_UVlaser_tune93_step1_run2652.root
+#outFileNameStep2 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/analyzeTOFPET2_wirelessBarInArray_HDR2_UVlaser_tune93_step2_run2652.root
+#outFileNameStep1 /data/ALIO/plots/moduleCharacterizationCoinNa22_step1_run2634_prova.root
+#outFileNameStep2 /data/ALIO/plots/moduleCharacterizationCoinNa22_step2_run2634_prova.root
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/FBK_thinQuartz/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/FBK_siliconeResin/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/HPK_HDR2/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/single_HPK_HDR2/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/LinearizationCo60/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/Co60Resolution/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/HPK_HDR2_externalBarCoincidence/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/TOFPET2_wirelessBarInArray_HDR2_UVlaser_tune93/
+#plotDir /var/www/html/ModuleCharacterization/guglielmi/prova/new/
+plotDir /var/www/html/ModuleCharacterization/guglielmi/LinearizationWirelessBar/Co60/
+
+
+
 </Output>
 
 
@@ -23,11 +46,22 @@ tResMax 250
 tResMode 2
 
 Vov          3   5   7
-energyBins 800 600 400
+energyBinsNa22 800 600 400
+energyBinsCo60 1000 750 500
+energyBinsLaser 800 600 400
 energyMin 0
-energyMax 40
-
+energyMaxNa22 40
+energyMaxCo60 50
+energyMaxLaser 35
 refBar 7
 refVov 7
 refTh 20
 </Plots>
+
+<Coincidence>
+status no
+chL 226
+chR 244
+peak511eBin 5 
+</Coincidence>
+

cfg/moduleCharacterization_step3.cfg

@@ -1,26 +1,64 @@
 <Input>
-inputDir /home/cmsdaq/martina/Lab5015Analysis/plots/
+inputDir1 /data/ALIO/plots/
+inputDir  /data/ALIO/plots/
 fileBaseName1 moduleCharacterization_step
+#fileBaseName1 moduleCharacterizationCoinNa22_step
 fileBaseName2 run
-#runs 2428-2453
+runs 2428-2453
 #runs 2548-2574
-runs 2375-2401
+#runs 2375-2401
+#runs 2608-2634
+#runs 2670-2672
+#runs 2674-2678
+#runs 2313-2315
+#runs 2316-2318
+#runs 2304-2312
+#runs 2326-2334
+#sourceName Co60
+#sourceName Co60SumPeak
+sourceName Na22
+#sourceName SingleBarNa22
+#sourceName SingleBarNa22_coinc
+
+
 </Input>
 
 <Output>
-#outFileNameStep3 /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_FBK_thinQuartz_step3.root
-#plotDirStep3 /var/www/html/ModuleCharacterization/FBK_thinQuartz/
-#outFileNameStep3 /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_FBK_siliconeResin_step3.root
-#plotDirStep3 /var/www/html/ModuleCharacterization/FBK_siliconeResin/
-outFileNameStep3 /home/cmsdaq/martina/Lab5015Analysis/plots/moduleCharacterization_HPK_HDR2_step3.root
-plotDirStep3 /var/www/html/ModuleCharacterization/HPK_HDR2/
+outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_FBK_thinQuartz_step3.root
+plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/FBK_thinQuartz/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_FBK_siliconeResin_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/FBK_siliconeResin/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_HPK_HDR2_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/HPK_HDR2/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/single_HPK_HDR2/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_HPK_HDR2_externalBarCoincidence_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/HPK_HDR2_externalBarCoincidence/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Co60_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/LinearizationCo60/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Co60_Res_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/Co60Resolution/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Na22_Lin_wirelessbarData_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/LinearizationWirelessBar/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Co60_Lin_wirelessbarData_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/LinearizationWirelessBar/Co60/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Na22_wirelessbarData_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/single_HPK_HDR2_notInArrayNa22/
+#outFileNameStep3 /home/cmsdaq/guglielmi/Lab5015Analysis/plots/moduleCharacterization_single_HPK_HDR2_Co60_wirelessbarData_step3.root
+#plotDirStep3 /var/www/html/ModuleCharacterization/guglielmi/single_HPK_HDR2_notInArrayCo60/
+
+
+
+
 </Output>
 
 <Plots>
 tResMin 0
 tResMax 250
 tResMode 2
 
+
+
 Vov          3   5   7
 energyBins 800 600 400
 energyMin 0
@@ -29,6 +67,18 @@ energyMax 40
 refBar 7
 refVov 7
 refTh 20
+#refTh_HDR2
+#refTh3 15
+#refTh5 15
+#refTh7 20
+#refTh_SingleHDR2
+#refTh3 20
+#refTh5 20
+#refTh7 20
+#refTh_FBK
+refTh3 10
+refTh5 15	
+refTh7 20
 </Plots>
 
 

interface/Co60SpectrumAnalyzer_2Peaks.h

@@ -0,0 +1,18 @@
+#ifndef CO60SPECTRUMANALYZER_2PEAKS_H
+#define CO60SPECTRUMANALYZER_2PEAKS_H
+
+#include <iostream>
+#include <vector>
+
+#include "TH1F.h"
+#include "TF1.h"
+#include "TLine.h"
+#include "TSpectrum.h"
+#include "TStyle.h"
+
+
+
+std::map<std::string,std::pair<float,float> > Co60SpectrumAnalyzer_2Peaks(TH1F* histo,
+                                                                   std::vector<float>* ranges = NULL);
+
+#endif

interface/Na22SpectrumAnalyzerSingleBar.h

@@ -0,0 +1,18 @@
+#ifndef NA22SPECTRUMANALYZERSINGLEBAR_H
+#define NA22SPECTRUMANALYZERSINGLEBAR_H
+
+#include <iostream>
+#include <vector>
+
+#include "TH1F.h"
+#include "TF1.h"
+#include "TLine.h"
+#include "TSpectrum.h"
+#include "TStyle.h"
+
+
+
+std::map<std::string,std::pair<float,float> > Na22SpectrumAnalyzerSingleBar(TH1F* histo,
+                                                                   std::vector<float>* ranges = NULL);
+
+#endif

interface/SiPM_HDR2.h

@@ -1,30 +1,36 @@
-// HDR2 SiPM parameters
-
-/*
-float PDE_vs_OV(const float& ov)
+float PDE_vs_OV(const float& ov, const std::string& type = "HDR2")
 {
-  return 39.4321 * ( 1. - exp(-1.*0.738063*ov) );
+  if( type == "HDR2" )
+    return 0.394321 * ( 1. - exp(-1.*0.738063*ov) );
+
+  if( type == "FBK_W7S" )
+    return 0.391748 * ( 1. - exp(-1.*0.288262*ov) );
+
+  return 0.;
 }
 
-float Gain_vs_OV(const float& ov)
+float Gain_vs_OV(const float& ov, const std::string& type = "HDR2")
 {
-  return 36890.225 + 97602.904*ov;
+  if( type == "HDR2" )
+    return 36890.225 + 97602.904*ov;
+
+  if( type == "FBK_W7S" )
+    //return 29131.588 + 104567.57 * ov;
+    //return 54174.9 + 95169.2 * ov;
+    return 50738.5 + 95149 * ov;
+
+
+  return 0.;
 }
-*/
-
-
 
-// FBK SiPM parameters
-float PDE_vs_OV(const float& ov)
+float ECF_vs_OV(const float& ov, const std::string& type = "HDR2")
 {
-
-  //return ( -1.5389053 + 22.812361*ov  - 10.091946*ov*ov + 3.6867230 *ov*ov*ov -0.73282017*ov*ov*ov*ov + 0.056861423*ov*ov*ov*ov*ov ) ;
-
-  return 45.5275 * ( 1. - exp(-1.*0.36229*ov) );  
-}
-
-float Gain_vs_OV(const float& ov)
-{
-  return 29131.588 + 104567.57 * ov;
-
+  if( type == "HDR2" )
+    return 1. + 0.0030812903 * ov + 0.0015623938 * ov * ov;
+
+  if( type == "FBK_W7S" )
+    //return 1. - 0.006356446 * ov + 0.0057041163 * ov * ov;
+    return 1.02366 - 0.00168754 * ov + 0.00284079 * ov * ov;
+
+  return 0.;
 }