@@ -54,14 +54,17 @@ Quality CalibQcCheck::check(std::map<std::string, std::shared_ptr<MonitorObject>
5454 result = Quality::Good;
5555 else
5656 result = Quality::Bad;
57+ // std::cout << "mTF = "<< mTF << std::endl;
5758 }
5859 if (mo->getName () == " NbNoiseROF" ) {
5960 auto * h = dynamic_cast <TH1F *>(mo->getObject ());
6061 mNoiseRof = h->GetBinContent (1 );
62+ // std::cout << "mNoiseRof = "<< mNoiseRof << std::endl;
6163 }
6264 if (mo->getName () == " NbDeadROF" ) {
6365 auto * h = dynamic_cast <TH1F *>(mo->getObject ());
6466 mDeadRof = h->GetBinContent (1 );
67+ // std::cout << "mDeadRof = "<< mDeadRof << std::endl;
6568 }
6669 }
6770 return result;
@@ -75,7 +78,7 @@ static void updateTitle(TH1* hist, std::string suffix)
7578 return ;
7679 }
7780 TString title = hist->GetTitle ();
78- title.Append (" (kHz) " );
81+ // title.Append(" (kHz) ");
7982 title.Append (suffix.c_str ());
8083 hist->SetTitle (title);
8184}
@@ -100,78 +103,103 @@ void CalibQcCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResu
100103 // printf("\n*********** CalibQcCheck ****** beautify \n");
101104 auto currentTime = getCurrentTime ();
102105 updateTitle (dynamic_cast <TH2F *>(mo->getObject ()), currentTime);
103- // printf("\n*********** CalibQcCheck ****** nTF = %d, nDeadRof = %d, nNoiseRof = %d\n",nTF,nDeadRof,nNoiseRof);
106+ float scaleNoise = 1 .;
107+ float scaleDead = 1 .;
108+ if (mOrbTF * mTF > 0 )
109+ scaleNoise = 1 . / (mTF * scaleTime * mOrbTF * 1000 ); // (kHz)
110+ if (mDeadRof > 0 )
111+ scaleDead = 100 . / mDeadRof ; // % Nb dead/Nb FET
112+
104113 if (checkResult == Quality::Good) {
105- // float scale = 1 / (mTF * scaleTime); //Dead max 998,1
106- // float scale = 1 / (mTF); //Dead max 11,38 (== 113826/10000TF)
107- // float scale = 1.; //Dead max 113826
108- // float scale = 100.;
109- float scale = 1 / (mTF * scaleTime * mOrbTF * 1000 ); // (kHz)
110114 // / Scale Noise Maps ::
111115 if (mo->getName () == " BendNoiseMap11" ) {
112116 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
113- h2->Scale (scale);
117+ updateTitle (h2, " (kHz)" );
118+ h2->Scale (scaleNoise);
119+ h2->SetMaximum (10 .);
114120 }
115121 if (mo->getName () == " BendNoiseMap12" ) {
116122 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
117- h2->Scale (scale);
123+ updateTitle (h2, " (kHz)" );
124+ h2->Scale (scaleNoise);
125+ h2->SetMaximum (10 .);
118126 }
119127 if (mo->getName () == " BendNoiseMap21" ) {
120128 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
121- h2->Scale (scale);
129+ updateTitle (h2, " (kHz)" );
130+ h2->Scale (scaleNoise);
131+ h2->SetMaximum (10 .);
122132 }
123133 if (mo->getName () == " BendNoiseMap22" ) {
124134 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
125- h2->Scale (scale);
135+ updateTitle (h2, " (kHz)" );
136+ h2->Scale (scaleNoise);
137+ h2->SetMaximum (10 .);
126138 }
127139 if (mo->getName () == " NBendNoiseMap11" ) {
128140 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
129- h2->Scale (scale);
141+ updateTitle (h2, " (kHz)" );
142+ h2->Scale (scaleNoise);
143+ h2->SetMaximum (10 );
130144 }
131145 if (mo->getName () == " NBendNoiseMap12" ) {
132146 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
133- h2->Scale (scale);
147+ updateTitle (h2, " (kHz)" );
148+ h2->Scale (scaleNoise);
149+ h2->SetMaximum (10 .);
134150 }
135151 if (mo->getName () == " NBendNoiseMap21" ) {
136152 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
137- h2->Scale (scale);
153+ updateTitle (h2, " (kHz)" );
154+ h2->Scale (scaleNoise);
155+ h2->SetMaximum (10 .);
138156 }
139157 if (mo->getName () == " NBendNoiseMap22" ) {
140158 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
141- h2->Scale (scale);
159+ updateTitle (h2, " (kHz)" );
160+ h2->Scale (scaleNoise);
161+ h2->SetMaximum (10 .);
142162 }
143163 // / Scale Dead Maps ::
144164 if (mo->getName () == " BendDeadMap11" ) {
145165 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
146- h2->Scale (scale);
166+ updateTitle (h2, " (%)" );
167+ h2->Scale (scaleDead);
147168 }
148169 if (mo->getName () == " BendDeadMap12" ) {
149170 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
150- h2->Scale (scale);
171+ updateTitle (h2, " (%)" );
172+ h2->Scale (scaleDead);
151173 }
152174 if (mo->getName () == " BendDeadMap21" ) {
153175 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
154- h2->Scale (scale);
176+ updateTitle (h2, " (%)" );
177+ h2->Scale (scaleDead);
155178 }
156179 if (mo->getName () == " BendDeadMap22" ) {
157180 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
158- h2->Scale (scale);
181+ updateTitle (h2, " (%)" );
182+ h2->Scale (scaleDead);
159183 }
160184 if (mo->getName () == " NBendDeadMap11" ) {
161185 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
162- h2->Scale (scale);
186+ updateTitle (h2, " (%)" );
187+ h2->Scale (scaleDead);
163188 }
164189 if (mo->getName () == " NBendDeadMap12" ) {
165190 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
166- h2->Scale (scale);
191+ updateTitle (h2, " (%)" );
192+ h2->Scale (scaleDead);
167193 }
168194 if (mo->getName () == " NBendDeadMap21" ) {
169195 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
170- h2->Scale (scale);
196+ updateTitle (h2, " (%)" );
197+ h2->Scale (scaleDead);
171198 }
172199 if (mo->getName () == " NBendDeadMap22" ) {
173200 auto * h2 = dynamic_cast <TH2F *>(mo->getObject ());
174- h2->Scale (scale);
201+ updateTitle (h2, " (%)" );
202+ h2->Scale (scaleDead);
175203 }
176204 }
177205}
0 commit comments